Merge pull request dotnet#7013 from swaroop-sridhar/PtrStruct

GcInfo: Report Struct containing one GcPointer correctly
DrewScoggins · Sep 1, 2016 · 68afd5c · 68afd5c
2 parents 3961806 + 060e0c6
commit 68afd5c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
@@ -906,7 +906,7 @@ var_types Compiler::getArgTypeForStruct(CORINFO_CLASS_HANDLE clsHnd,
 //         that multiple registers are used to return this struct.
 //
 var_types Compiler::getReturnTypeForStruct(CORINFO_CLASS_HANDLE clsHnd,
-                                           structPassingKind*   wbReturnStruct,
+                                           structPassingKind*   wbReturnStruct /* = nullptr */,
                                            unsigned             structSize /* = 0 */)
 {
     var_types         useType           = TYP_UNKNOWN;

diff --git a/src/jit/compiler.h b/src/jit/compiler.h
@@ -3841,7 +3841,7 @@ class Compiler
     // If you have already retrieved the struct size then pass it as the optional third argument
     //
     var_types getReturnTypeForStruct(CORINFO_CLASS_HANDLE clsHnd,
-                                     structPassingKind*   wbPassStruct,
+                                     structPassingKind*   wbPassStruct = nullptr,
                                      unsigned             structSize = 0);
 
 #ifdef DEBUG

diff --git a/src/jit/gcencode.cpp b/src/jit/gcencode.cpp
@@ -3541,6 +3541,7 @@ void GCInfo::gcInfoBlockHdrSave(GcInfoEncoder* gcInfoEncoder, unsigned methodSiz
     switch (compiler->info.compRetType)
     {
         case TYP_REF:
+        case TYP_ARRAY:
             returnKind = RT_Object;
             break;
         case TYP_BYREF:
@@ -3549,19 +3550,42 @@ void GCInfo::gcInfoBlockHdrSave(GcInfoEncoder* gcInfoEncoder, unsigned methodSiz
         case TYP_STRUCT:
         {
             CORINFO_CLASS_HANDLE structType = compiler->info.compMethodInfo->args.retTypeClass;
-            if (compiler->IsMultiRegReturnedType(structType) && !compiler->IsHfa(structType))
+            var_types retType = compiler->getReturnTypeForStruct(structType);
+
+            switch (retType)
             {
-                BYTE gcPtrs[2] = {TYPE_GC_NONE, TYPE_GC_NONE};
-                compiler->info.compCompHnd->getClassGClayout(structType, gcPtrs);
+            case TYP_ARRAY:
+                _ASSERTE(false && "TYP_ARRAY unexpected from getReturnTypeForStruct()");
 
-                ReturnKind first  = GCTypeToReturnKind((CorInfoGCType)gcPtrs[0]);
-                ReturnKind second = GCTypeToReturnKind((CorInfoGCType)gcPtrs[1]);
+            case TYP_REF:
+                returnKind = RT_Object;
+                break;
 
-                returnKind = GetStructReturnKind(first, second);
-            }
-            else
-            {
+            case TYP_BYREF:
+                returnKind = RT_ByRef;
+                break;
+
+            case TYP_STRUCT:
+                if (compiler->IsHfa(structType))
+                {
+                    returnKind = RT_Scalar;
+                }
+                else
+                {
+                    // Multi-reg return
+                    BYTE gcPtrs[2] = { TYPE_GC_NONE, TYPE_GC_NONE };
+                    compiler->info.compCompHnd->getClassGClayout(structType, gcPtrs);
+
+                    ReturnKind first = GCTypeToReturnKind((CorInfoGCType)gcPtrs[0]);
+                    ReturnKind second = GCTypeToReturnKind((CorInfoGCType)gcPtrs[1]);
+
+                    returnKind = GetStructReturnKind(first, second);
+                }
+                break;
+
+            default:
                 returnKind = RT_Scalar;
+                break;
             }
             break;
         }