From 788de160c5aec67b3025550b103455dce8b210e5 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Thu, 21 Mar 2013 10:36:57 +0000 Subject: [PATCH] Remove instrumentation for Code::CopyFrom crasher. R=jkummerow@chromium.org BUG=chromium:196330 Review URL: https://codereview.chromium.org/12606009 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14021 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/heap.cc | 8 -------- src/objects.cc | 15 ++++----------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/heap.cc b/src/heap.cc index 4ae73c1..40ba412 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -3785,11 +3785,7 @@ MaybeObject* Heap::CreateCode(const CodeDesc& desc, ASSERT(!isolate_->code_range()->exists() || isolate_->code_range()->contains(code->address())); code->set_instruction_size(desc.instr_size); - // TODO(mstarzinger): Remove once we found the bug. - CHECK(reloc_info->IsByteArray()); code->set_relocation_info(reloc_info); - // TODO(mstarzinger): Remove once we found the bug. - CHECK(code->relocation_info()->IsByteArray()); code->set_flags(flags); if (code->is_call_stub() || code->is_keyed_call_stub()) { code->set_check_type(RECEIVER_MAP_CHECK); @@ -3805,8 +3801,6 @@ MaybeObject* Heap::CreateCode(const CodeDesc& desc, } // Allow self references to created code object by patching the handle to // point to the newly allocated Code object. - CHECK(code->IsCode()); - CHECK(code->relocation_info()->IsByteArray()); if (!self_reference.is_null()) { *(self_reference.location()) = code; } @@ -3815,8 +3809,6 @@ MaybeObject* Heap::CreateCode(const CodeDesc& desc, // that are dereferenced during the copy to point directly to the actual heap // objects. These pointers can include references to the code object itself, // through the self_reference parameter. - CHECK(code->IsCode()); - CHECK(code->relocation_info()->IsByteArray()); code->CopyFrom(desc); #ifdef VERIFY_HEAP diff --git a/src/objects.cc b/src/objects.cc index f330a5e..dbbec58 100644 --- a/src/objects.cc +++ b/src/objects.cc @@ -8813,19 +8813,12 @@ void Code::CopyFrom(const CodeDesc& desc) { ASSERT(Marking::Color(this) == Marking::WHITE_OBJECT); // copy code - CHECK(IsCode()); - CHECK(relocation_info()->IsByteArray()); - CHECK(reinterpret_cast(instruction_start()) == - reinterpret_cast(this) + Code::kHeaderSize - kHeapObjectTag); - CopyBytes(instruction_start(), desc.buffer, desc.instr_size); + CopyBytes(instruction_start(), desc.buffer, desc.instr_size); // copy reloc info - // TODO(mstarzinger): Remove once we found the bug. - CHECK(IsCode()); - CHECK(relocation_info()->IsByteArray()); - CopyBytes(relocation_start(), - desc.buffer + desc.buffer_size - desc.reloc_size, - desc.reloc_size); + CopyBytes(relocation_start(), + desc.buffer + desc.buffer_size - desc.reloc_size, + desc.reloc_size); // unbox handles and relocate intptr_t delta = instruction_start() - desc.buffer; -- 2.7.4