Bug 826126 - Just use an assert to check for aliasing; r=benjamin
authorTerrence Cole <terrence@mozilla.com>
Wed, 02 Jan 2013 17:13:16 -0800
changeset 126756 89bc8559149f355b564c2acc2efb65e98eb9ec21
parent 126755 13c525135b4aa6b90509337ae707d4702dd66343
child 126757 39b72947ad7951787f07640cc44324287ab094d0
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenjamin
bugs826126, 767013
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 826126 - Just use an assert to check for aliasing; r=benjamin This appears to be debug code that crept in for bug 767013.
js/src/vm/Stack-inl.h
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -238,19 +238,16 @@ StackFrame::unaliasedLocal(unsigned i, M
     return slots()[i];
 }
 
 inline Value &
 StackFrame::unaliasedFormal(unsigned i, MaybeCheckAliasing checkAliasing)
 {
     JS_ASSERT(i < numFormalArgs());
     JS_ASSERT_IF(checkAliasing, !script()->argsObjAliasesFormals());
-    if (checkAliasing && script()->formalIsAliased(i)) {
-        while (true) {}
-    }
     JS_ASSERT_IF(checkAliasing, !script()->formalIsAliased(i));
     return formals()[i];
 }
 
 inline Value &
 StackFrame::unaliasedActual(unsigned i, MaybeCheckAliasing checkAliasing)
 {
     JS_ASSERT(i < numActualArgs());