Fix linux/x64 SIMD returns

dotnet · Apr 9, 2019 · 82c3f66 · 82c3f66
1 parent f95753a
commit 82c3f66
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/jit/lsrabuild.cpp b/src/jit/lsrabuild.cpp
@@ -3062,7 +3062,16 @@ int LinearScan::BuildReturn(GenTree* tree)
         regMaskTP useCandidates = RBM_NONE;
 
 #if FEATURE_MULTIREG_RET
-        if (tree->TypeGet() == TYP_STRUCT)
+#ifdef _TARGET_ARM64_
+        if (varTypeIsSIMD(tree))
+        {
+            useCandidates = allSIMDRegs();
+            BuildUse(op1, useCandidates);
+            return 1;
+        }
+#endif // !_TARGET_ARM64_
+
+        if (varTypeIsStruct(tree))
         {
             // op1 has to be either an lclvar or a multi-reg returning call
             if (op1->OperGet() == GT_LCL_VAR)
@@ -3083,16 +3092,6 @@ int LinearScan::BuildReturn(GenTree* tree)
                 return srcCount;
             }
         }
-        else if (varTypeIsSIMD(tree))
-        {
-#ifdef _TARGET_ARM64_
-            useCandidates = allSIMDRegs();
-            BuildUse(op1, useCandidates);
-            return 1;
-#else  // !_TARGET_ARM64_
-            assert(!"Unexpected SIMD return type");
-#endif // !_TARGET_ARM64_
-        }
         else
 #endif // FEATURE_MULTIREG_RET
         {