Bug 592199 - call js_PutArguments from trace always (r=dmandelin, a=blocking)

js/src/jstracer.cpp

@@ -10310,12 +10310,9 @@ TraceRecorder::putActivationObjects()
 {
     JSStackFrame *fp = cx->fp();
 
-    bool have_args = fp->hasArgsObj() &&
-        !fp->getArgsObj()->isStrictArguments() &&
-        fp->numActualArgs() > 0;
-    bool have_call = fp->hasFunction() &&
-        JSFUN_HEAVYWEIGHT_TEST(fp->getFunction()->flags) &&
-        fp->getFunction()->countArgsAndVars();
+    bool have_args = fp->hasArgsObj() && !fp->getArgsObj()->isStrictArguments();
+    bool have_call = fp->hasCallObj();
+    JS_ASSERT(have_call == (fp->hasFunction() && fp->getFunction()->isHeavyweight()));
 
     if (!have_args && !have_call)
         return;

js/src/trace-test/tests/testPutOnEmptyArgsObject.js

@@ -0,0 +1,16 @@
+var g;
+
+function h() {
+    return arguments.length;
+}
+
+function f() {
+    var args = arguments;
+    g = function() { return h.apply(this, args); }
+}
+
+for (var i = 0; i < 10; ++i) {
+    f();
+}
+
+assertEq(g(), 0);