From 05c73983a73cfa65f2a86e7cb122b2191d64b9c0 Mon Sep 17 00:00:00 2001 From: "kmillikin@chromium.org" Date: Thu, 30 Jun 2011 15:49:14 +0000 Subject: [PATCH] Remove bogus assertion. 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 --- src/ia32/macro-assembler-ia32.cc | 11 ++++------- src/x64/macro-assembler-x64.cc | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc index a80821f..feb8268 100644 --- a/src/ia32/macro-assembler-ia32.cc +++ b/src/ia32/macro-assembler-ia32.cc @@ -1766,17 +1766,14 @@ void MacroAssembler::LoadContext(Register dst, int context_chain_length) { mov(dst, esi); } - // 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()) { cmp(FieldOperand(dst, HeapObject::kMapOffset), isolate()->factory()->with_context_map()); 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."); } } diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 7c8a366..dbed6e0 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/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."); } } -- 2.7.4