Updates based on PR review.

diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp
index 45995cc..9928506 100644 (file)
--- a/src/jit/codegenxarch.cpp
+++ b/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/jit/gtlist.h b/src/jit/gtlist.h
index d0837c1..707ae61 100644 (file)
--- a/src/jit/gtlist.h
+++ b/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.