Chromium Code Reviews

Unified Diff: src/deoptimizer.cc

Issue 7321008: Try to fix Windows compilation error. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « src/deoptimizer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
}
« no previous file with comments | « src/deoptimizer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine