mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 21:31:04 +00:00
Backed out changeset 8756a6262190 (bug 1357075)
This commit is contained in:
parent
76338929ce
commit
bef66488d9
@ -5470,14 +5470,6 @@ BytecodeEmitter::wrapWithDestructuringIteratorCloseTryNote(int32_t iterDepth, In
|
||||
{
|
||||
MOZ_ASSERT(this->stackDepth >= iterDepth);
|
||||
|
||||
// Pad a nop at the beginning of the bytecode covered by the trynote so
|
||||
// that when unwinding environments, we may unwind to the scope
|
||||
// corresponding to the pc *before* the start, in case the first bytecode
|
||||
// emitted by |emitter| is the start of an inner scope. See comment above
|
||||
// UnwindEnvironmentToTryPc.
|
||||
if (!emit1(JSOP_TRY_DESTRUCTURING_ITERCLOSE))
|
||||
return false;
|
||||
|
||||
ptrdiff_t start = offset();
|
||||
if (!emitter(this))
|
||||
return false;
|
||||
|
@ -1,10 +0,0 @@
|
||||
// |jit-test| error: TypeError
|
||||
|
||||
var iterable = {};
|
||||
var iterator = {
|
||||
return: 1
|
||||
};
|
||||
iterable[Symbol.iterator] = function() {
|
||||
return iterator;
|
||||
};
|
||||
for ([ class get {} ().iterator ] of [iterable]) {}
|
@ -1098,9 +1098,6 @@ js::UnwindEnvironmentToTryPc(JSScript* script, JSTryNote* tn)
|
||||
if (tn->kind == JSTRY_CATCH || tn->kind == JSTRY_FINALLY) {
|
||||
pc -= JSOP_TRY_LENGTH;
|
||||
MOZ_ASSERT(*pc == JSOP_TRY);
|
||||
} else if (tn->kind == JSTRY_DESTRUCTURING_ITERCLOSE) {
|
||||
pc -= JSOP_TRY_DESTRUCTURING_ITERCLOSE_LENGTH;
|
||||
MOZ_ASSERT(*pc == JSOP_TRY_DESTRUCTURING_ITERCLOSE);
|
||||
}
|
||||
return pc;
|
||||
}
|
||||
@ -1941,7 +1938,7 @@ CASE(EnableInterruptsPseudoOpcode)
|
||||
/* Various 1-byte no-ops. */
|
||||
CASE(JSOP_NOP)
|
||||
CASE(JSOP_NOP_DESTRUCTURING)
|
||||
CASE(JSOP_TRY_DESTRUCTURING_ITERCLOSE)
|
||||
CASE(JSOP_UNUSED220)
|
||||
CASE(JSOP_UNUSED221)
|
||||
CASE(JSOP_UNUSED222)
|
||||
CASE(JSOP_UNUSED223)
|
||||
|
@ -2251,16 +2251,7 @@
|
||||
* Stack: obj => obj
|
||||
*/ \
|
||||
macro(JSOP_CHECKISCALLABLE, 219, "checkiscallable", NULL, 2, 1, 1, JOF_UINT8) \
|
||||
\
|
||||
/*
|
||||
* No-op used by the exception unwinder to determine the correct
|
||||
* environment to unwind to when performing IteratorClose due to
|
||||
* destructuring.
|
||||
* Category: Other
|
||||
* Operands:
|
||||
* Stack: =>
|
||||
*/ \
|
||||
macro(JSOP_TRY_DESTRUCTURING_ITERCLOSE, 220, "try-destructuring-iterclose", NULL, 1, 0, 0, JOF_BYTE) \
|
||||
macro(JSOP_UNUSED220, 220,"unused220", NULL, 1, 0, 0, JOF_BYTE) \
|
||||
macro(JSOP_UNUSED221, 221,"unused221", NULL, 1, 0, 0, JOF_BYTE) \
|
||||
macro(JSOP_UNUSED222, 222,"unused222", NULL, 1, 0, 0, JOF_BYTE) \
|
||||
macro(JSOP_UNUSED223, 223,"unused223", NULL, 1, 0, 0, JOF_BYTE) \
|
||||
|
Loading…
Reference in New Issue
Block a user