Merge pull request #1215 from richardlford/rosfix

Modify conservative GC code for unaligned InlinedCallFrames
dotnet · Jul 9, 2015 · eed62e3 · eed62e3
2 parents 9945fc4 + 2d9199d
commit eed62e3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/vm/gcenv.cpp b/src/vm/gcenv.cpp
@@ -511,7 +511,14 @@ VOID GCToEEInterface::ScanStackRoots(Thread * pThread, promote_func* fn, ScanCon
         // Since we report every thing as pinned, we don't need to run following code for relocation phase.
         if (sc->promotion)
         {
-            Object ** topStack = (Object **)pThread->GetFrame();
+            Frame* pTopFrame = pThread->GetFrame();
+            Object ** topStack = (Object **)pTopFrame;
+            if ((pTopFrame != ((Frame*)-1)) 
+                && (pTopFrame->GetVTablePtr() == InlinedCallFrame::GetMethodFrameVPtr())) {
+                // It is an InlinedCallFrame. Get SP from it.
+                InlinedCallFrame* pInlinedFrame = (InlinedCallFrame*)pTopFrame;
+                topStack = (Object **)pInlinedFrame->GetCallSiteSP();
+            } 
             Object ** bottomStack = (Object **) pThread->GetCachedStackBase();
             Object ** walk;
             for (walk = topStack; walk < bottomStack; walk ++)