Fix for a badly placed assert in the *unix arg passing classification. (#4608)

There is a badly placed assert in the *nix arg passing classification.
This change moves the assert before incrementing the field count and adds
test for the problem.

Fixes issue #4584.

diff --git a/src/vm/methodtable.cpp b/src/vm/methodtable.cpp
index ce04b51076e7f3d4d7a2bf909b24c7abaa1c26a4..bc2597f0f1cd90dafbf7f040b971f53a758911aa 100644 (file)
--- a/src/vm/methodtable.cpp
+++ b/src/vm/methodtable.cpp
@@ -2512,7 +2512,6 @@ bool MethodTable::ClassifyEightBytesWithManagedLayout(SystemVStructRegisterPassi
                     GetSystemVClassificationTypeName(helperPtr->fieldClassifications[helperPtr->currentUniqueOffsetField])));
 
                 helperPtr->currentUniqueOffsetField++;
-                _ASSERTE(helperPtr->currentUniqueOffsetField < SYSTEMV_MAX_NUM_FIELDS_IN_REGISTER_PASSED_STRUCT);
 #ifdef _DEBUG
                 ++fieldNum;
 #endif // _DEBUG
@@ -2601,8 +2600,8 @@ bool MethodTable::ClassifyEightBytesWithManagedLayout(SystemVStructRegisterPassi
                GetSystemVClassificationTypeName(fieldClassificationType),
                GetSystemVClassificationTypeName(helperPtr->fieldClassifications[helperPtr->currentUniqueOffsetField])));
 
-        helperPtr->currentUniqueOffsetField++;
         _ASSERTE(helperPtr->currentUniqueOffsetField < SYSTEMV_MAX_NUM_FIELDS_IN_REGISTER_PASSED_STRUCT);
+        helperPtr->currentUniqueOffsetField++;
     } // end per-field for loop
 
     AssignClassifiedEightByteTypes(helperPtr, nestingLevel);
@@ -3009,10 +3008,9 @@ bool MethodTable::ClassifyEightBytesWithNativeLayout(SystemVStructRegisterPassin
             GetSystemVClassificationTypeName(fieldClassificationType),
             GetSystemVClassificationTypeName(helperPtr->fieldClassifications[helperPtr->currentUniqueOffsetField])));
 
+        _ASSERTE(helperPtr->currentUniqueOffsetField < SYSTEMV_MAX_NUM_FIELDS_IN_REGISTER_PASSED_STRUCT);
         helperPtr->currentUniqueOffsetField++;
         ((BYTE*&)pFieldMarshaler) += MAXFIELDMARSHALERSIZE;
-        _ASSERTE(helperPtr->currentUniqueOffsetField < SYSTEMV_MAX_NUM_FIELDS_IN_REGISTER_PASSED_STRUCT);
-
     } // end per-field for loop
 
     AssignClassifiedEightByteTypes(helperPtr, nestingLevel);

diff --git a/tests/src/JIT/Methodical/structs/systemvbringup/structpasstest1.cs b/tests/src/JIT/Methodical/structs/systemvbringup/structpasstest1.cs
index 959790b7536c7f5fbf288c948e5300c2c57e8344..8ffa4c111fa6b2a9324c2cea41aef9ee2c30a4a5 100644 (file)
--- a/tests/src/JIT/Methodical/structs/systemvbringup/structpasstest1.cs
+++ b/tests/src/JIT/Methodical/structs/systemvbringup/structpasstest1.cs
@@ -117,6 +117,26 @@ namespace structinreg
         public Test13 t13;
     }
 
+    struct Test15
+    {
+        public byte b0;
+        public byte b1;
+        public byte b2;
+        public byte b3;
+        public byte b4;
+        public byte b5;
+        public byte b6;
+        public byte b7;
+        public byte b8;
+        public byte b9;
+        public byte b10;
+        public byte b11;
+        public byte b12;
+        public byte b13;
+        public byte b14;
+        public byte b15;
+    }
+
     class Program1
     {
         [MethodImplAttribute(MethodImplOptions.NoInlining)]
@@ -203,6 +223,17 @@ namespace structinreg
             return t14.t13.foo1.iFoo;
         }
 
+        [MethodImplAttribute(MethodImplOptions.NoInlining)]
+        static int test15(Test15 t15)
+        {
+            Console.WriteLine("t15 Res: {0}", t15.b0 + t15.b1 + t15.b2 + t15.b3 +
+                t15.b4 + t15.b5 + t15.b6 + t15.b7 + t15.b8 + t15.b9 + t15.b10 + 
+                t15.b11 + t15.b12 + t15.b13 + t15.b14 + t15.b15);
+            return (t15.b0 + t15.b1 + t15.b2 + t15.b3 +
+                t15.b4 + t15.b5 + t15.b6 + t15.b7 + t15.b8 + t15.b9 + t15.b10 +
+                t15.b11 + t15.b12 + t15.b13 + t15.b14 + t15.b15);
+        }
+
         [MethodImplAttribute(MethodImplOptions.NoInlining)]
         public static int Main1()
         {
@@ -369,6 +400,30 @@ namespace structinreg
                 throw new Exception("Failed test7 test!");
             }
 
+            Test15 t15 = default(Test15);
+            t15.b0 = 1;
+            t15.b1 = 2;
+            t15.b2 = 3;
+            t15.b3 = 4;
+            t15.b4 = 5;
+            t15.b5 = 6;
+            t15.b6 = 7;
+            t15.b7 = 8;
+            t15.b8 = 9;
+            t15.b9 = 10;
+            t15.b10 = 11;
+            t15.b11 = 12;
+            t15.b12 = 13;
+            t15.b13 = 14;
+            t15.b14 = 15;
+            t15.b15 = 16;
+
+            int t15Res = test15(t15);
+            Console.WriteLine("test15 Result: {0}", t15Res);
+            if (t15Res != 136) {
+                throw new Exception("Failed test15 test!");
+            }
+
             return 100;
         }
     }