From a4c66d9f07931262a1520424991b4abda7d25a5b Mon Sep 17 00:00:00 2001 From: Ron Cain Date: Sat, 16 Jan 2016 16:37:22 -0800 Subject: [PATCH] Fix incorrect placement of FEATURE_SIMD ifdef, and syntax error under _TARGET_ARM_. Ron Cain checking in for Carol Eidt after validating fix. [tfs-changeset: 1565967] --- src/jit/flowgraph.cpp | 4 +--- src/jit/lclvars.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) mode change 100755 => 100644 src/jit/flowgraph.cpp diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp old mode 100755 new mode 100644 index c1f1f8f..39fd0a6 --- a/src/jit/flowgraph.cpp +++ b/src/jit/flowgraph.cpp @@ -21652,13 +21652,11 @@ GenTreePtr Compiler::fgGetStructAsStructPtr(GenTreePtr tree) (tree->gtOper == GT_FIELD) || (tree->gtOper == GT_IND) || (tree->gtOper == GT_LDOBJ) || -#ifdef FEATURE_SIMD - (tree->gtOper == GT_SIMD) || + tree->OperIsSIMD() || // tree->gtOper == GT_CALL || cannot get address of call. // tree->gtOper == GT_MKREFANY || inlining should've been aborted due to mkrefany opcode. // tree->gtOper == GT_RET_EXPR || cannot happen after fgUpdateInlineReturnExpressionPlaceHolder (tree->gtOper == GT_COMMA)); -#endif // FEATURE_SIMD switch (tree->OperGet()) { diff --git a/src/jit/lclvars.cpp b/src/jit/lclvars.cpp index 3f7c3f0..2fad8fe 100644 --- a/src/jit/lclvars.cpp +++ b/src/jit/lclvars.cpp @@ -561,7 +561,7 @@ void Compiler::lvaInitUserArgs(InitVarDscInfo * varDscInfo) #ifdef _TARGET_ARM_ - var_types hfaType = (varTypeIsStruct(argType) ? GetHfaType(typeHnd) : TYP_UNDEF; + var_types hfaType = (varTypeIsStruct(argType)) ? GetHfaType(typeHnd) : TYP_UNDEF; bool isHfaArg = !info.compIsVarArgs && varTypeIsFloating(hfaType); // On ARM we pass the first 4 words of integer arguments and non-HFA structs in registers. -- 2.7.4