From 6e4e0064a6ef1202a5f5da432c4d61e4ffed6d97 Mon Sep 17 00:00:00 2001 From: Carol Eidt Date: Tue, 10 Jan 2017 14:19:46 -0800 Subject: [PATCH] Updates based on PR review. Commit migrated from https://github.com/dotnet/coreclr/commit/589bf0aed4e69685e976e69678731d774ebaa05c --- src/coreclr/src/jit/codegenxarch.cpp | 2 +- src/coreclr/src/jit/gtlist.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/jit/codegenxarch.cpp b/src/coreclr/src/jit/codegenxarch.cpp index 45995cc..9928506 100644 --- a/src/coreclr/src/jit/codegenxarch.cpp +++ b/src/coreclr/src/jit/codegenxarch.cpp @@ -7779,7 +7779,7 @@ void CodeGen::genPutArgStk(GenTreePutArgStk* putArgStk) // On a 32-bit target, all of the long arguments are handled with GT_FIELD_LIST, // and the type of the putArgStk is TYP_VOID. - noway_assert(targetType != TYP_LONG); + assert(targetType != TYP_LONG); const unsigned argSize = putArgStk->getArgSize(); assert((argSize % TARGET_POINTER_SIZE) == 0); diff --git a/src/coreclr/src/jit/gtlist.h b/src/coreclr/src/jit/gtlist.h index d0837c1..707ae61 100644 --- a/src/coreclr/src/jit/gtlist.h +++ b/src/coreclr/src/jit/gtlist.h @@ -46,7 +46,7 @@ GTNODE(CNS_STR , "sconst" ,GenTreeStrCon ,0,GTK_LEAF|GTK_CON //----------------------------------------------------------------------------- GTNODE(NOT , "~" ,GenTreeOp ,0,GTK_UNOP) -GTNODE(NOP , "nop" ,GenTree ,0,GTK_UNOP|GTK_NOVALUE) +GTNODE(NOP , "nop" ,GenTree ,0,GTK_UNOP) GTNODE(NEG , "unary -" ,GenTreeOp ,0,GTK_UNOP) GTNODE(COPY , "copy" ,GenTreeCopyOrReload,0,GTK_UNOP) // Copies a variable from its current location to a register that satisfies // code generation constraints. The child is the actual lclVar node. -- 2.7.4