Merge pull request #6035 from briansull/fix-5642

briansull · web-flow · commit 2d2f439cfc05 · 2016-06-28T15:51:05.000-07:00
Fix issue #5642
diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp
@@ -4893,9 +4893,9 @@ void                Compiler::fgFixupStructReturn(GenTreePtr     callNode)
 
     if (!callHasRetBuffArg && varTypeIsStruct(call))
     {
-#ifdef FEATURE_HFA
+#if FEATURE_MULTIREG_RET
         if (call->gtCall.IsVarargs() || !IsHfa(call))
-#endif 
+#endif // FEATURE_MULTIREG_RET
         {
             // Now that we are past the importer, re-type this node so the register predictor does
             // the right thing
diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst
@@ -64215,7 +64215,7 @@ RelativePath=JIT\SIMD\VectorReturn_ro\VectorReturn_ro.cmd
 WorkingDir=JIT\SIMD\VectorReturn_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;R2R_FAIL;ISSUE_5642
+Categories=Pri0;EXPECTED_PASS;ISSUE_5642
 HostStyle=0
 [VectorSet_r.cmd_9294]
 RelativePath=JIT\SIMD\VectorSet_r\VectorSet_r.cmd

Original file line number	Diff line number	Diff line change
`@@ -4893,9 +4893,9 @@ void Compiler::fgFixupStructReturn(GenTreePtr callNode)`
`4893`	`4893`
`4894`	`4894`	`if (!callHasRetBuffArg && varTypeIsStruct(call))`
`4895`	`4895`	`{`
`4896`		`-#ifdef FEATURE_HFA`
	`4896`	`+#if FEATURE_MULTIREG_RET`
`4897`	`4897`	`if (call->gtCall.IsVarargs() \|\| !IsHfa(call))`
`4898`		`-#endif`
	`4898`	`+#endif // FEATURE_MULTIREG_RET`
`4899`	`4899`	`{`
`4900`	`4900`	`// Now that we are past the importer, re-type this node so the register predictor does`
`4901`	`4901`	`// the right thing`