Allow non-primitive struct returns to not require a stub. Fixes dotne…

…t#35928.
jkoritzinsky · Dec 4, 2020 · 0302e18 · 0302e18
1 parent 4a200d1
commit 0302e18
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/src/coreclr/src/vm/dllimport.cpp b/src/coreclr/src/vm/dllimport.cpp
@@ -3227,21 +3227,7 @@ BOOL NDirect::MarshalingRequired(
                         return TRUE;
                 }
 #endif
-
-                // return value is fine as long as it can be normalized to an integer
-                if (i == 0)
-                {
-                    CorElementType normalizedType = hndArgType.GetInternalCorElementType();
-                    if (normalizedType == ELEMENT_TYPE_VALUETYPE)
-                    {
-                        // it is a structure even after normalization
-                        return TRUE;
-                    }
-                }
-                else
-                {
-                    dwStackSize += StackElemSize(hndArgType.GetSize());
-                }
+                dwStackSize += StackElemSize(hndArgType.GetSize());
                 break;
             }