Reviewers: William Hesse,
Description:
Try to fix Windows compilation error.
[email protected]
BUG=none
TEST=none
Please review this at http://codereview.chromium.org/7321008/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/deoptimizer.h
M src/deoptimizer.cc
Index: src/deoptimizer.cc
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index
7eebef85d6cd60744110caf062cb61f5bf7bbba7..e0651c7cc19ce4a6bf8d5de04bfee581c0ebdf18
100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -161,7 +161,7 @@ DeoptimizedFrameInfo*
Deoptimizer::DebuggerInspectableFrame(
// Get the "simulated" top and size for the requested frame.
Address top =
reinterpret_cast<Address>(deoptimizer->output_[frame_index]->GetTop());
- unsigned size = deoptimizer->output_[frame_index]->GetFrameSize();
+ uint32_t size = deoptimizer->output_[frame_index]->GetFrameSize();
// Done with the GC-unsafe frame descriptions. This re-enables
allocation.
deoptimizer->DeleteFrameDescriptions();
@@ -546,7 +546,7 @@ void Deoptimizer::MaterializeHeapNumbers() {
#ifdef ENABLE_DEBUGGER_SUPPORT
void Deoptimizer::MaterializeHeapNumbersForDebuggerInspectableFrame(
- Address top, intptr_t size, DeoptimizedFrameInfo* info) {
+ Address top, uint32_t size, DeoptimizedFrameInfo* info) {
ASSERT_EQ(DEBUGGER, bailout_type_);
for (int i = 0; i < deferred_heap_numbers_.length(); i++) {
HeapNumberMaterializationDescriptor d = deferred_heap_numbers_[i];
@@ -574,7 +574,9 @@ void
Deoptimizer::MaterializeHeapNumbersForDebuggerInspectableFrame(
} else {
// Calculate parameter index subtracting one for the receiver.
int parameter_index =
- index + size / kPointerSize - info->expression_count_ - 1;
+ index +
+ static_cast<int>(size) / kPointerSize -
+ info->expression_count_ - 1;
info->SetParameter(parameter_index, *num);
}
}
Index: src/deoptimizer.h
diff --git a/src/deoptimizer.h b/src/deoptimizer.h
index
27ff8ddcce51679f070cce934d820f9e79775dca..9265905366bb6e3921f0f803d92e83c6e5175a07
100644
--- a/src/deoptimizer.h
+++ b/src/deoptimizer.h
@@ -194,7 +194,7 @@ class Deoptimizer : public Malloced {
void MaterializeHeapNumbers();
#ifdef ENABLE_DEBUGGER_SUPPORT
void MaterializeHeapNumbersForDebuggerInspectableFrame(
- Address top, intptr_t size, DeoptimizedFrameInfo* info);
+ Address top, uint32_t size, DeoptimizedFrameInfo* info);
#endif
static void ComputeOutputFrames(Deoptimizer* deoptimizer);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
