[x86/Linux] Skip scanning untracked frame variables

When scanning the stack roots
it skips scanning untracked frame variables for funclets

src/vm/eetwain.cpp

@@ -4249,18 +4249,6 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pContext,
 
 #endif // _DEBUG
 
-#ifdef WIN64EXCEPTIONS   // funclets
-    //
-    // If we're in a funclet, we do not want to report the incoming varargs.  This is
-    // taken care of by the parent method and the funclet should access those arguments
-    // by way of the parent method's stack frame.
-    //
-    if(pCodeInfo->IsFunclet())
-    {
-        return true;
-    }
-#endif // WIN64EXCEPTIONS
-
     /* What kind of a frame is this ? */
 
     FrameType   frameType = FR_NORMAL;
@@ -4598,6 +4586,18 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pContext,
     unsigned ptrAddr;
     unsigned lowBits;
 
+#ifdef WIN64EXCEPTIONS
+    if (pCodeInfo->IsFunclet())
+    {
+        count = info.untrackedCnt;
+        while (count-- > 0)
+        {
+            fastSkipSigned(table);
+        }
+    }
+    else
+#endif
+    {
 
     /* Process the untracked frame variable table */
 
@@ -4657,6 +4657,8 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pContext,
                                           true)));
     }
 
+    }
+
 #if VERIFY_GC_TABLES
     _ASSERTE(*castto(table, unsigned short *)++ == 0xCAFE);
 #endif
@@ -4764,6 +4766,18 @@ bool EECodeManager::EnumGcRefs( PREGDISPLAY     pContext,
     _ASSERTE(*castto(table, unsigned short *)++ == 0xBABE);
 #endif
 
+#ifdef WIN64EXCEPTIONS   // funclets
+    //
+    // If we're in a funclet, we do not want to report the incoming varargs.  This is
+    // taken care of by the parent method and the funclet should access those arguments
+    // by way of the parent method's stack frame.
+    //
+    if(pCodeInfo->IsFunclet())
+    {
+        return true;
+    }
+#endif // WIN64EXCEPTIONS
+
     /* Are we a varargs function, if so we have to report all args
        except 'this' (note that the GC tables created by the x86 jit
        do not contain ANY arguments except 'this' (even if they