Reviewers: Jakob, Description: Make newer GCCs happier: Fixed NULL vs. 0 confusion.
Please review this at http://codereview.chromium.org/7970008/ SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/arm/deoptimizer-arm.cc M src/ia32/deoptimizer-ia32.cc M src/incremental-marking.cc M src/mark-compact.cc M src/x64/deoptimizer-x64.cc Index: src/arm/deoptimizer-arm.cc =================================================================== --- src/arm/deoptimizer-arm.cc (revision 9332) +++ src/arm/deoptimizer-arm.cc (working copy) @@ -173,7 +173,7 @@ RelocInfo rinfo(pc_after - 2 * kInstrSize, RelocInfo::CODE_TARGET, - NULL, + 0, unoptimized_code); unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode( unoptimized_code, &rinfo, replacement_code); Index: src/ia32/deoptimizer-ia32.cc =================================================================== --- src/ia32/deoptimizer-ia32.cc (revision 9332) +++ src/ia32/deoptimizer-ia32.cc (working copy) @@ -255,7 +255,7 @@ RelocInfo rinfo(call_target_address, RelocInfo::CODE_TARGET, - NULL, + 0, unoptimized_code); unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode( unoptimized_code, &rinfo, replacement_code); Index: src/incremental-marking.cc =================================================================== --- src/incremental-marking.cc (revision 9332) +++ src/incremental-marking.cc (working copy) @@ -89,7 +89,7 @@ if (IsMarking()) { Code* host = heap_->isolate()->pc_to_code_cache()->GcSafeFindCodeForPc(pc); - RelocInfo rinfo(pc, RelocInfo::CODE_TARGET, NULL, host); + RelocInfo rinfo(pc, RelocInfo::CODE_TARGET, 0, host); RecordWriteIntoCode(host, &rinfo, value); } } Index: src/mark-compact.cc =================================================================== --- src/mark-compact.cc (revision 9332) +++ src/mark-compact.cc (working copy) @@ -2684,7 +2684,7 @@ Address addr) { switch (slot_type) { case SlotsBuffer::CODE_TARGET_SLOT: { - RelocInfo rinfo(addr, RelocInfo::CODE_TARGET, NULL, NULL); + RelocInfo rinfo(addr, RelocInfo::CODE_TARGET, 0, NULL); rinfo.Visit(v); break; } @@ -2698,12 +2698,12 @@ break; } case SlotsBuffer::DEBUG_TARGET_SLOT: { - RelocInfo rinfo(addr, RelocInfo::DEBUG_BREAK_SLOT, NULL, NULL); + RelocInfo rinfo(addr, RelocInfo::DEBUG_BREAK_SLOT, 0, NULL); if (rinfo.IsPatchedDebugBreakSlotSequence()) rinfo.Visit(v); break; } case SlotsBuffer::JS_RETURN_SLOT: { - RelocInfo rinfo(addr, RelocInfo::JS_RETURN, NULL, NULL); + RelocInfo rinfo(addr, RelocInfo::JS_RETURN, 0, NULL); if (rinfo.IsPatchedReturnSequence()) rinfo.Visit(v); break; } Index: src/x64/deoptimizer-x64.cc =================================================================== --- src/x64/deoptimizer-x64.cc (revision 9332) +++ src/x64/deoptimizer-x64.cc (working copy) @@ -254,7 +254,7 @@ RelocInfo rinfo(call_target_address, RelocInfo::CODE_TARGET, - NULL, + 0, unoptimized_code); unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode( unoptimized_code, &rinfo, replacement_code); -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
