Reviewers: ,
Message:
Committed patchset #1 manually as 23318 (tree was closed).
Description:
Fix Win64 build after r23316.
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=23318
Please review this at https://codereview.chromium.org/494393002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -6 lines):
M test/heap-unittests/heap-unittest.cc
Index: test/heap-unittests/heap-unittest.cc
diff --git a/test/heap-unittests/heap-unittest.cc
b/test/heap-unittests/heap-unittest.cc
index
6e7b004ecaa3933aee1654af8fd6d09db8ef38f1..dd56f9dc3bb9fb9b263655e3e0f86309c253a550
100644
--- a/test/heap-unittests/heap-unittest.cc
+++ b/test/heap-unittests/heap-unittest.cc
@@ -74,7 +74,8 @@ TEST_F(GCIdleTimeHandlerTest,
AfterContextDisposeLargeIdleTime) {
heap_state.contexts_disposed = 1;
heap_state.incremental_marking_stopped = true;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = (heap_state.size_of_objects + speed - 1) / speed;
+ int idle_time_ms =
+ static_cast<int>((heap_state.size_of_objects + speed - 1) / speed);
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_FULL_GC, action.type);
}
@@ -85,7 +86,7 @@ TEST_F(GCIdleTimeHandlerTest,
AfterContextDisposeSmallIdleTime1) {
heap_state.contexts_disposed = 1;
heap_state.incremental_marking_stopped = true;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = heap_state.size_of_objects / speed - 1;
+ int idle_time_ms = static_cast<int>(heap_state.size_of_objects / speed -
1);
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
}
@@ -95,7 +96,7 @@ TEST_F(GCIdleTimeHandlerTest,
AfterContextDisposeSmallIdleTime2) {
GCIdleTimeHandler::HeapState heap_state = DefaultHeapState();
heap_state.contexts_disposed = 1;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = heap_state.size_of_objects / speed - 1;
+ int idle_time_ms = static_cast<int>(heap_state.size_of_objects / speed -
1);
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_INCREMENTAL_MARKING, action.type);
}
@@ -131,7 +132,7 @@ TEST_F(GCIdleTimeHandlerTest, NotEnoughTime) {
heap_state.incremental_marking_stopped = true;
heap_state.can_start_incremental_marking = false;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = heap_state.size_of_objects / speed - 1;
+ int idle_time_ms = static_cast<int>(heap_state.size_of_objects / speed -
1);
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_NOTHING, action.type);
}
@@ -142,7 +143,7 @@ TEST_F(GCIdleTimeHandlerTest, StopEventually1) {
heap_state.incremental_marking_stopped = true;
heap_state.can_start_incremental_marking = false;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = heap_state.size_of_objects / speed + 1;
+ int idle_time_ms = static_cast<int>(heap_state.size_of_objects / speed +
1);
for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++)
{
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_FULL_GC, action.type);
@@ -171,7 +172,7 @@ TEST_F(GCIdleTimeHandlerTest, ContinueAfterStop1) {
heap_state.incremental_marking_stopped = true;
heap_state.can_start_incremental_marking = false;
size_t speed = heap_state.mark_compact_speed_in_bytes_per_ms;
- int idle_time_ms = heap_state.size_of_objects / speed + 1;
+ int idle_time_ms = static_cast<int>(heap_state.size_of_objects / speed +
1);
for (int i = 0; i < GCIdleTimeHandler::kMaxMarkCompactsInIdleRound; i++)
{
GCIdleTimeAction action = handler()->Compute(idle_time_ms, heap_state);
EXPECT_EQ(DO_FULL_GC, action.type);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
