Revision: 16288
Author: [email protected]
Date: Fri Aug 23 11:04:25 2013 UTC
Log: Cleanup and speedup MarkCompactCollector test case.
[email protected]
TEST=cctest/test-mark-compact/MarkCompactCollector
Review URL: https://codereview.chromium.org/23112026
http://code.google.com/p/v8/source/detail?r=16288
Modified:
/branches/bleeding_edge/test/cctest/test-mark-compact.cc
=======================================
--- /branches/bleeding_edge/test/cctest/test-mark-compact.cc Thu Aug 22
16:14:37 2013 UTC
+++ /branches/bleeding_edge/test/cctest/test-mark-compact.cc Fri Aug 23
11:04:25 2013 UTC
@@ -147,86 +147,88 @@
TEST(MarkCompactCollector) {
+ FLAG_incremental_marking = false;
CcTest::InitializeVM();
+ Isolate* isolate = Isolate::Current();
+ Heap* heap = isolate->heap();
v8::HandleScope sc(CcTest::isolate());
+
// call mark-compact when heap is empty
- HEAP->CollectGarbage(OLD_POINTER_SPACE);
+ heap->CollectGarbage(OLD_POINTER_SPACE, "trigger 1");
// keep allocating garbage in new space until it fails
const int ARRAY_SIZE = 100;
Object* array;
MaybeObject* maybe_array;
do {
- maybe_array = HEAP->AllocateFixedArray(ARRAY_SIZE);
+ maybe_array = heap->AllocateFixedArray(ARRAY_SIZE);
} while (maybe_array->ToObject(&array));
- HEAP->CollectGarbage(NEW_SPACE);
+ heap->CollectGarbage(NEW_SPACE, "trigger 2");
- array = HEAP->AllocateFixedArray(ARRAY_SIZE)->ToObjectChecked();
+ array = heap->AllocateFixedArray(ARRAY_SIZE)->ToObjectChecked();
// keep allocating maps until it fails
Object* mapp;
MaybeObject* maybe_mapp;
do {
- maybe_mapp = HEAP->AllocateMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
+ maybe_mapp = heap->AllocateMap(JS_OBJECT_TYPE, JSObject::kHeaderSize);
} while (maybe_mapp->ToObject(&mapp));
- HEAP->CollectGarbage(MAP_SPACE);
- mapp = HEAP->AllocateMap(JS_OBJECT_TYPE,
+ heap->CollectGarbage(MAP_SPACE, "trigger 3");
+ mapp = heap->AllocateMap(JS_OBJECT_TYPE,
JSObject::kHeaderSize)->ToObjectChecked();
// allocate a garbage
String* func_name = String::cast(
- HEAP->InternalizeUtf8String("theFunction")->ToObjectChecked());
+ heap->InternalizeUtf8String("theFunction")->ToObjectChecked());
SharedFunctionInfo* function_share = SharedFunctionInfo::cast(
- HEAP->AllocateSharedFunctionInfo(func_name)->ToObjectChecked());
+ heap->AllocateSharedFunctionInfo(func_name)->ToObjectChecked());
JSFunction* function = JSFunction::cast(
- HEAP->AllocateFunction(*Isolate::Current()->function_map(),
+ heap->AllocateFunction(*isolate->function_map(),
function_share,
- HEAP->undefined_value())->ToObjectChecked());
+ heap->undefined_value())->ToObjectChecked());
Map* initial_map =
- Map::cast(HEAP->AllocateMap(JS_OBJECT_TYPE,
+ Map::cast(heap->AllocateMap(JS_OBJECT_TYPE,
JSObject::kHeaderSize)->ToObjectChecked());
function->set_initial_map(initial_map);
- Isolate::Current()->context()->global_object()->SetProperty(
+ isolate->context()->global_object()->SetProperty(
func_name, function, NONE, kNonStrictMode)->ToObjectChecked();
JSObject* obj = JSObject::cast(
- HEAP->AllocateJSObject(function)->ToObjectChecked());
- HEAP->CollectGarbage(OLD_POINTER_SPACE);
+ heap->AllocateJSObject(function)->ToObjectChecked());
+ heap->CollectGarbage(OLD_POINTER_SPACE, "trigger 4");
func_name = String::cast(
- HEAP->InternalizeUtf8String("theFunction")->ToObjectChecked());
- CHECK(Isolate::Current()->context()->global_object()->
- HasLocalProperty(func_name));
- Object* func_value = Isolate::Current()->context()->global_object()->
+ heap->InternalizeUtf8String("theFunction")->ToObjectChecked());
+ CHECK(isolate->context()->global_object()->HasLocalProperty(func_name));
+ Object* func_value = isolate->context()->global_object()->
GetProperty(func_name)->ToObjectChecked();
CHECK(func_value->IsJSFunction());
function = JSFunction::cast(func_value);
- obj =
JSObject::cast(HEAP->AllocateJSObject(function)->ToObjectChecked());
+ obj =
JSObject::cast(heap->AllocateJSObject(function)->ToObjectChecked());
String* obj_name =
-
String::cast(HEAP->InternalizeUtf8String("theObject")->ToObjectChecked());
- Isolate::Current()->context()->global_object()->SetProperty(
+
String::cast(heap->InternalizeUtf8String("theObject")->ToObjectChecked());
+ isolate->context()->global_object()->SetProperty(
obj_name, obj, NONE, kNonStrictMode)->ToObjectChecked();
String* prop_name =
-
String::cast(HEAP->InternalizeUtf8String("theSlot")->ToObjectChecked());
+
String::cast(heap->InternalizeUtf8String("theSlot")->ToObjectChecked());
obj->SetProperty(prop_name,
Smi::FromInt(23),
NONE,
kNonStrictMode)->ToObjectChecked();
- HEAP->CollectGarbage(OLD_POINTER_SPACE);
+ heap->CollectGarbage(OLD_POINTER_SPACE, "trigger 5");
obj_name =
-
String::cast(HEAP->InternalizeUtf8String("theObject")->ToObjectChecked());
- CHECK(Isolate::Current()->context()->global_object()->
- HasLocalProperty(obj_name));
- CHECK(Isolate::Current()->context()->global_object()->
+
String::cast(heap->InternalizeUtf8String("theObject")->ToObjectChecked());
+ CHECK(isolate->context()->global_object()->HasLocalProperty(obj_name));
+ CHECK(isolate->context()->global_object()->
GetProperty(obj_name)->ToObjectChecked()->IsJSObject());
- obj = JSObject::cast(Isolate::Current()->context()->global_object()->
+ obj = JSObject::cast(isolate->context()->global_object()->
GetProperty(obj_name)->ToObjectChecked());
prop_name =
-
String::cast(HEAP->InternalizeUtf8String("theSlot")->ToObjectChecked());
+
String::cast(heap->InternalizeUtf8String("theSlot")->ToObjectChecked());
CHECK(obj->GetProperty(prop_name) == Smi::FromInt(23));
}
--
--
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/groups/opt_out.
