Revision: 9333
Author: [email protected]
Date: Tue Sep 20 02:43:58 2011
Log: Make newer GCCs happier: Fixed NULL vs. 0 confusion.
Review URL: http://codereview.chromium.org/7970008
http://code.google.com/p/v8/source/detail?r=9333
Modified:
/branches/bleeding_edge/src/arm/deoptimizer-arm.cc
/branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc
/branches/bleeding_edge/src/incremental-marking.cc
/branches/bleeding_edge/src/mark-compact.cc
/branches/bleeding_edge/src/x64/deoptimizer-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Mon Sep 19 11:36:47
2011
+++ /branches/bleeding_edge/src/arm/deoptimizer-arm.cc Tue Sep 20 02:43:58
2011
@@ -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);
=======================================
--- /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Mon Sep 19
11:36:47 2011
+++ /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Tue Sep 20
02:43:58 2011
@@ -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);
=======================================
--- /branches/bleeding_edge/src/incremental-marking.cc Mon Sep 19 11:36:47
2011
+++ /branches/bleeding_edge/src/incremental-marking.cc Tue Sep 20 02:43:58
2011
@@ -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);
}
}
=======================================
--- /branches/bleeding_edge/src/mark-compact.cc Mon Sep 19 11:36:47 2011
+++ /branches/bleeding_edge/src/mark-compact.cc Tue Sep 20 02:43:58 2011
@@ -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;
}
=======================================
--- /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Mon Sep 19 11:36:47
2011
+++ /branches/bleeding_edge/src/x64/deoptimizer-x64.cc Tue Sep 20 02:43:58
2011
@@ -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
