Bug 1155900 - Followup test-fix and no-longer-correct assertion removal. r=bustage in a CLOSED TREE
☠☠ backed out by c119270176bb ☠ ☠
authorJeff Walden <jwalden@mit.edu>
Thu, 30 Apr 2015 22:54:53 -0700
changeset 273350 8b3bb908f6fc2d0f97cf702f07515b29220c48db
parent 273349 9d6fc27d1c775b217b32f0ede8dadbac2877901e
child 273351 c119270176bb369fdbcdae7c882779b3d380e06b
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1155900
milestone40.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 1155900 - Followup test-fix and no-longer-correct assertion removal. r=bustage in a CLOSED TREE
js/src/tests/js1_8/regress/regress-469625-03.js
js/src/vm/Interpreter.cpp
--- a/js/src/tests/js1_8/regress/regress-469625-03.js
+++ b/js/src/tests/js1_8/regress/regress-469625-03.js
@@ -21,18 +21,18 @@ function test()
   enterFunc ('test');
   printBugNumber(BUGNUMBER);
   printStatus (summary);
  
   function f(x) {
     var [a, b, [c0, c1]] = [x, x, x];
   }
 
-  expect = `TypeError: (intermediate value)[Symbol.iterator](...).next(...).value is null`;
-  actual = 'No Error';
+  expect = "TypeError: can't convert null to object";
+  actual = "No Error";
   try
   {
     f(null);
   }
   catch(ex)
   {
     actual = ex + '';
   }
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -201,17 +201,16 @@ NoSuchMethod(JSContext* cx, unsigned arg
         cx->compartment()->warnedAboutNoSuchMethod = true;
     }
 
     InvokeArgs args(cx);
     if (!args.init(2))
         return false;
 
     MOZ_ASSERT(vp[0].isObject());
-    MOZ_ASSERT(vp[1].isObject());
     NativeObject* obj = &vp[0].toObject().as<NativeObject>();
     MOZ_ASSERT(obj->getClass() == &js_NoSuchMethodClass);
 
     args.setCallee(obj->getReservedSlot(JSSLOT_FOUND_FUNCTION));
     args.setThis(vp[1]);
     args[0].set(obj->getReservedSlot(JSSLOT_SAVED_ID));
     JSObject* argsobj = NewDenseCopiedArray(cx, argc, vp + 2);
     if (!argsobj)