summaryrefslogtreecommitdiff
path: root/deps/v8/src/x64/macro-assembler-x64.cc
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-07-05 11:42:20 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-07-05 11:42:20 -0700
commit32a0752d4932705b652996be30f8e94ad3c12f45 (patch)
tree912b0af1863529fb72627d188025f306ca73445d /deps/v8/src/x64/macro-assembler-x64.cc
parent9c771691122d88918f1458f85c37d5294c26900b (diff)
parent6054dcc1302d1a1ef51e215dcf1ad16fb967f1ba (diff)
downloadnode-new-32a0752d4932705b652996be30f8e94ad3c12f45.tar.gz
Merge branch 'V8-3.4'
Diffstat (limited to 'deps/v8/src/x64/macro-assembler-x64.cc')
-rw-r--r--deps/v8/src/x64/macro-assembler-x64.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/deps/v8/src/x64/macro-assembler-x64.cc b/deps/v8/src/x64/macro-assembler-x64.cc
index 7c8a3667e3..dbed6e0fda 100644
--- a/deps/v8/src/x64/macro-assembler-x64.cc
+++ b/deps/v8/src/x64/macro-assembler-x64.cc
@@ -3628,17 +3628,14 @@ void MacroAssembler::LoadContext(Register dst, int context_chain_length) {
movq(dst, rsi);
}
- // We should not have found a with or catch context by walking the context
- // chain (i.e., the static scope chain and runtime context chain do not
- // agree). A variable occurring in such a scope should have slot type
- // LOOKUP and not CONTEXT.
+ // We should not have found a with context by walking the context
+ // chain (i.e., the static scope chain and runtime context chain do
+ // not agree). A variable occurring in such a scope should have
+ // slot type LOOKUP and not CONTEXT.
if (emit_debug_code()) {
CompareRoot(FieldOperand(dst, HeapObject::kMapOffset),
Heap::kWithContextMapRootIndex);
Check(not_equal, "Variable resolved to with context.");
- CompareRoot(FieldOperand(dst, HeapObject::kMapOffset),
- Heap::kCatchContextMapRootIndex);
- Check(not_equal, "Variable resolved to catch context.");
}
}