Merge pull request #8463 from CarolEidt/Fix288220

Allow remorph of SIMD assignment
dotnet · Dec 6, 2016 · a04f79c · a04f79c
2 parents 7b92136 + 70e11ac
commit a04f79c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp
@@ -10579,7 +10579,7 @@ GenTreePtr Compiler::fgMorphSmpOp(GenTreePtr tree, MorphAddrContext* mac)
                 {
                     // We should check whether op2 should be assigned to a SIMD field or not.
                     // If it is, we should tranlate the tree to simd intrinsic.
-                    assert((tree->gtDebugFlags & GTF_DEBUG_NODE_MORPHED) == 0);
+                    assert(!fgGlobalMorph || ((tree->gtDebugFlags & GTF_DEBUG_NODE_MORPHED) == 0));
                     GenTreePtr newTree = fgMorphFieldAssignToSIMDIntrinsicSet(tree);
                     typ                = tree->TypeGet();
                     op1                = tree->gtGetOp1();