[JAEGER] Merge from tracemonkey. This picks up the test fix mentioned in the previous commit comment.
[JAEGER] Merge from tracemonkey. This picks up the test fix mentioned in the previous commit comment.
--- a/js/src/trace-test/tests/basic/testReconstructImacroPCStack.js
+++ b/js/src/trace-test/tests/basic/testReconstructImacroPCStack.js
@@ -1,23 +1,28 @@
-var actual = "";
-var expect = "TypeError: x is not a function";
-
x = Proxy.create((function () {
return {
get: function () {}
}
}()), Object.e)
+var hit = false;
+
try {
Function("\
for(var a = 0; a < 2; ++a) {\
if (a == 0) {}\
else {\
x > x\
}\
}\
")()
} catch (e) {
- actual = "" + e;
+ hit = true;
+
+ var str = String(e);
+ var match = (str == "TypeError: x is not a function" ||
+ str == "TypeError: can't convert x to number");
+
+ assertEq(match, true);
}
-assertEq(actual, expect);
+assertEq(hit, true);