AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Remove bogus assertion.

Browse Source 
R=fschneider@chromium.org

Review URL: http://codereview.chromium.org/7291001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8499 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
kmillikin@chromium.org 2011-06-30 15:49:14 +00:00
parent eb380e0f85
commit 05c73983a7
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ia32/macro-assembler-ia32.cc
View File

@ -1766,17 +1766,14 @@ void MacroAssembler::LoadContext(Register dst, int context_chain_length) {
mov(dst, esi); mov(dst, esi);
} }
// We should not have found a with or catch context by walking the context // We should not have found a with context by walking the context chain
// chain (i.e., the static scope chain and runtime context chain do not // (i.e., the static scope chain and runtime context chain do not agree).
// agree). A variable occurring in such a scope should have slot type // A variable occurring in such a scope should have slot type LOOKUP and
// LOOKUP and not CONTEXT. // not CONTEXT.
if (emit_debug_code()) { if (emit_debug_code()) {
cmp(FieldOperand(dst, HeapObject::kMapOffset), cmp(FieldOperand(dst, HeapObject::kMapOffset),
isolate()->factory()->with_context_map()); isolate()->factory()->with_context_map());
Check(not_equal, "Variable resolved to with context."); Check(not_equal, "Variable resolved to with context.");
cmp(FieldOperand(dst, HeapObject::kMapOffset),
isolate()->factory()->with_context_map());
Check(not_equal, "Variable resolved to catch context.");
} }
} }

11
src/x64/macro-assembler-x64.cc
View File

@ -3628,17 +3628,14 @@ void MacroAssembler::LoadContext(Register dst, int context_chain_length) {
movq(dst, rsi); movq(dst, rsi);
} }
// We should not have found a with or catch context by walking the 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 // chain (i.e., the static scope chain and runtime context chain do
// agree). A variable occurring in such a scope should have slot type // not agree). A variable occurring in such a scope should have
// LOOKUP and not CONTEXT. // slot type LOOKUP and not CONTEXT.
if (emit_debug_code()) { if (emit_debug_code()) {
CompareRoot(FieldOperand(dst, HeapObject::kMapOffset), CompareRoot(FieldOperand(dst, HeapObject::kMapOffset),
Heap::kWithContextMapRootIndex); Heap::kWithContextMapRootIndex);
Check(not_equal, "Variable resolved to with context."); Check(not_equal, "Variable resolved to with context.");
CompareRoot(FieldOperand(dst, HeapObject::kMapOffset),
Heap::kCatchContextMapRootIndex);
Check(not_equal, "Variable resolved to catch context.");
} }
} }