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

Fix crash introduced in r5019.

Browse Source 
Note to self: never leave uninitialized objects in the code space.

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5029 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
kaznacheev@chromium.org 2010-07-06 13:48:51 +00:00
parent 12e62f316d
commit 4798d2c4f3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/heap.cc
View File

@ -2351,6 +2351,11 @@ Object* Heap::CreateCode(const CodeDesc& desc,
ZoneScopeInfo* sinfo, ZoneScopeInfo* sinfo,
Code::Flags flags, Code::Flags flags,
Handle<Object> self_reference) { Handle<Object> self_reference) {
// Allocate ByteArray before the Code object, so that we do not risk
// leaving uninitialized Code object (and breaking the heap).
Object* reloc_info = AllocateByteArray(desc.reloc_size, TENURED);
if (reloc_info->IsFailure()) return reloc_info;
// Compute size // Compute size
int body_size = RoundUp(desc.instr_size, kObjectAlignment); int body_size = RoundUp(desc.instr_size, kObjectAlignment);
int sinfo_size = 0; int sinfo_size = 0;
@ -2366,9 +2371,6 @@ Object* Heap::CreateCode(const CodeDesc& desc,
if (result->IsFailure()) return result; if (result->IsFailure()) return result;
Object* reloc_info = AllocateByteArray(desc.reloc_size, TENURED);
if (reloc_info->IsFailure()) return reloc_info;
// Initialize the object // Initialize the object
HeapObject::cast(result)->set_map(code_map()); HeapObject::cast(result)->set_map(code_map());
Code* code = Code::cast(result); Code* code = Code::cast(result);
@ -2422,6 +2424,11 @@ Object* Heap::CopyCode(Code* code) {
Object* Heap::CopyCode(Code* code, Vector<byte> reloc_info) { Object* Heap::CopyCode(Code* code, Vector<byte> reloc_info) {
// Allocate ByteArray before the Code object, so that we do not risk
// leaving uninitialized Code object (and breaking the heap).
Object* reloc_info_array = AllocateByteArray(reloc_info.length(), TENURED);
if (reloc_info_array->IsFailure()) return reloc_info_array;
int new_body_size = RoundUp(code->instruction_size(), kObjectAlignment); int new_body_size = RoundUp(code->instruction_size(), kObjectAlignment);
int sinfo_size = code->sinfo_size(); int sinfo_size = code->sinfo_size();
@ -2442,9 +2449,6 @@ Object* Heap::CopyCode(Code* code, Vector<byte> reloc_info) {
if (result->IsFailure()) return result; if (result->IsFailure()) return result;
Object* reloc_info_array = AllocateByteArray(reloc_info.length(), TENURED);
if (reloc_info_array->IsFailure()) return reloc_info_array;
// Copy code object. // Copy code object.
Address new_addr = reinterpret_cast<HeapObject*>(result)->address(); Address new_addr = reinterpret_cast<HeapObject*>(result)->address();