From fa33d67667dcb62dbf14a162f2df0bad4ac05fe2 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Sat, 22 Jun 2013 01:58:36 +0200
Subject: [PATCH] Bug 881902 follow-up - Mark StackFrame callee and |this|,
 should fix GGC build. r=terrence on IRC

---
 js/src/vm/Stack.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 4f4e574d331..fc14410d6d6 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -432,8 +432,11 @@ StackFrame::markValues(JSTracer *trc, Value *sp)
 {
     JS_ASSERT(sp >= slots());
     gc::MarkValueRootRange(trc, sp - slots(), slots(), "vm_stack");
-    if (hasArgs())
-        gc::MarkValueRootRange(trc, js::Max(numActualArgs(), numFormalArgs()), argv_, "fp argv");
+    if (hasArgs()) {
+        // Mark callee, |this| and arguments.
+        unsigned argc = Max(numActualArgs(), numFormalArgs());
+        gc::MarkValueRootRange(trc, argc + 2, argv_ - 2, "fp argv");
+    }
 }
 
 static void