mozilla-central: changeset 213057:de7878c31f764b45d6525283a7069ce2083a97c7

author	Shu-yu Guo <shu@rfrn.org>
	Wed, 29 Oct 2014 19:41:43 -0700
changeset 213057	de7878c31f764b45d6525283a7069ce2083a97c7
parent 213056	0fd81599968665168cf6cfaa000300ed39097b4d
child 213058	b56b9aa70d22803fd0d9f8a68e043dc863c2efe3
push id	27738
push user	cbook@mozilla.com
push date	Thu, 30 Oct 2014 13:46:07 +0000
treeherder	mozilla-central@1aa1b23d799e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	efaust
bugs	1090764
milestone	36.0a1
first release with	nightly linux32 e0b505a37b1c / 36.0a1 / 20141031030201 / files nightly linux64 e0b505a37b1c / 36.0a1 / 20141031030201 / files nightly mac e0b505a37b1c / 36.0a1 / 20141031030201 / files nightly win32 e0b505a37b1c / 36.0a1 / 20141031030201 / files nightly win64 e0b505a37b1c / 36.0a1 / 20141031030201 / files
last release without	nightly linux32 80e18ff7c7b2 / 36.0a1 / 20141030030218 / files nightly linux64 80e18ff7c7b2 / 36.0a1 / 20141030030218 / files nightly mac 80e18ff7c7b2 / 36.0a1 / 20141030030218 / files nightly win32 80e18ff7c7b2 / 36.0a1 / 20141030030218 / files nightly win64 80e18ff7c7b2 / 36.0a1 / 20141030030218 / files

--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -480,17 +480,17 @@ AbstractFramePtr::numActualArgs() const
 
 inline unsigned
 AbstractFramePtr::numFormalArgs() const
 {
     if (isInterpreterFrame())
         return asInterpreterFrame()->numFormalArgs();
     if (isBaselineFrame())
         return asBaselineFrame()->numFormalArgs();
-    return asRematerializedFrame()->numActualArgs();
+    return asRematerializedFrame()->numFormalArgs();
 }
 
 inline Value &
 AbstractFramePtr::unaliasedVar(uint32_t i, MaybeCheckAliasing checkAliasing)
 {
     if (isInterpreterFrame())
         return asInterpreterFrame()->unaliasedVar(i, checkAliasing);
     if (isBaselineFrame())