[v8-dev] Simplify WeakMap and WeakSet tests slightly. (issue 903463002 by [email protected])

Wed, 04 Feb 2015 05:14:58 -0800 

Reviewers: rossberg,

Description:
Simplify WeakMap and WeakSet tests slightly.

[email protected]
TEST=cctest/test-weakmaps,cctest/test-weaksets

Please review this at https://codereview.chromium.org/903463002/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+15, -27 lines):
  M test/cctest/test-weakmaps.cc
  M test/cctest/test-weaksets.cc


Index: test/cctest/test-weakmaps.cc
diff --git a/test/cctest/test-weakmaps.cc b/test/cctest/test-weakmaps.cc
index c3b0c2efd1b3596cff4fefb3500b3762fcd3c20d..04f41b9aee979161b05a6ebb2c74e5b6792c7459 100644 
--- a/test/cctest/test-weakmaps.cc
+++ b/test/cctest/test-weakmaps.cc
@@ -52,12 +52,6 @@ static Handle<JSWeakMap> AllocateJSWeakMap(Isolate* isolate) { 
   return weakmap;
 }

-static void PutIntoWeakMap(Handle<JSWeakMap> weakmap,
-                           Handle<JSObject> key,
-                           Handle<Object> value) {
-  Runtime::WeakCollectionSet(weakmap, key, value);
-}
-
 static int NumberOfWeakCalls = 0;
 static void WeakPointerCallback(
     const v8::WeakCallbackData<v8::Value, void>& data) {
@@ -95,8 +89,9 @@ TEST(Weakness) {
     HandleScope scope(isolate);
Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); 
     Handle<JSObject> object = factory->NewJSObjectFromMap(map);
- PutIntoWeakMap(weakmap, Handle<JSObject>(JSObject::cast(*key)), object); - PutIntoWeakMap(weakmap, object, Handle<Smi>(Smi::FromInt(23), isolate)); 
+    Handle<Smi> smi(Smi::FromInt(23), isolate);
+    Runtime::WeakCollectionSet(weakmap, key, object);
+    Runtime::WeakCollectionSet(weakmap, object, smi);
   }
   CHECK_EQ(2, ObjectHashTable::cast(weakmap->table())->NumberOfElements());

@@ -150,7 +145,8 @@ TEST(Shrinking) {
Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); 
     for (int i = 0; i < 32; i++) {
       Handle<JSObject> object = factory->NewJSObjectFromMap(map);
- PutIntoWeakMap(weakmap, object, Handle<Smi>(Smi::FromInt(i), isolate)); 
+      Handle<Smi> smi(Smi::FromInt(i), isolate);
+      Runtime::WeakCollectionSet(weakmap, object, smi);
     }
   }

@@ -197,7 +193,7 @@ TEST(Regress2060a) {
       Handle<JSObject> object = factory->NewJSObject(function, TENURED);
       CHECK(!heap->InNewSpace(object->address()));
       CHECK(!first_page->Contains(object->address()));
-      PutIntoWeakMap(weakmap, key, object);
+      Runtime::WeakCollectionSet(weakmap, key, object);
     }
   }

@@ -237,9 +233,8 @@ TEST(Regress2060b) {
   }
   Handle<JSWeakMap> weakmap = AllocateJSWeakMap(isolate);
   for (int i = 0; i < 32; i++) {
-    PutIntoWeakMap(weakmap,
-                   keys[i],
-                   Handle<Smi>(Smi::FromInt(i), isolate));
+    Handle<Smi> smi(Smi::FromInt(i), isolate);
+    Runtime::WeakCollectionSet(weakmap, keys[i], smi);
   }
// Force compacting garbage collection. The subsequent collections are used 
Index: test/cctest/test-weaksets.cc
diff --git a/test/cctest/test-weaksets.cc b/test/cctest/test-weaksets.cc
index 60f2d45dc358d8c186bc139a943763db21e39f38..f08a99bcbfa250f8f4c1584379c3bdf101bf17ab 100644 
--- a/test/cctest/test-weaksets.cc
+++ b/test/cctest/test-weaksets.cc
@@ -55,12 +55,6 @@ static Handle<JSWeakSet> AllocateJSWeakSet(Isolate* isolate) { 
   return weakset;
 }

-static void PutIntoWeakSet(Handle<JSWeakSet> weakset,
-                           Handle<JSObject> key,
-                           Handle<Object> value) {
-  Runtime::WeakCollectionSet(weakset, key, value);
-}
-
 static int NumberOfWeakCalls = 0;
 static void WeakPointerCallback(
     const v8::WeakCallbackData<v8::Value, void>& data) {
@@ -96,9 +90,8 @@ TEST(WeakSet_Weakness) {
   // Put entry into weak set.
   {
     HandleScope scope(isolate);
-    PutIntoWeakSet(weakset,
-                   Handle<JSObject>(JSObject::cast(*key)),
-                   Handle<Smi>(Smi::FromInt(23), isolate));
+    Handle<Smi> smi(Smi::FromInt(23), isolate);
+    Runtime::WeakCollectionSet(weakset, key, smi);
   }
   CHECK_EQ(1, ObjectHashTable::cast(weakset->table())->NumberOfElements());

@@ -152,7 +145,8 @@ TEST(WeakSet_Shrinking) {
Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); 
     for (int i = 0; i < 32; i++) {
       Handle<JSObject> object = factory->NewJSObjectFromMap(map);
- PutIntoWeakSet(weakset, object, Handle<Smi>(Smi::FromInt(i), isolate)); 
+      Handle<Smi> smi(Smi::FromInt(i), isolate);
+      Runtime::WeakCollectionSet(weakset, object, smi);
     }
   }

@@ -199,7 +193,7 @@ TEST(WeakSet_Regress2060a) {
       Handle<JSObject> object = factory->NewJSObject(function, TENURED);
       CHECK(!heap->InNewSpace(object->address()));
       CHECK(!first_page->Contains(object->address()));
-      PutIntoWeakSet(weakset, key, object);
+      Runtime::WeakCollectionSet(weakset, key, object);
     }
   }

@@ -239,9 +233,8 @@ TEST(WeakSet_Regress2060b) {
   }
   Handle<JSWeakSet> weakset = AllocateJSWeakSet(isolate);
   for (int i = 0; i < 32; i++) {
-    PutIntoWeakSet(weakset,
-                   keys[i],
-                   Handle<Smi>(Smi::FromInt(i), isolate));
+    Handle<Smi> smi(Smi::FromInt(i), isolate);
+    Runtime::WeakCollectionSet(weakset, keys[i], smi);
   }
// Force compacting garbage collection. The subsequent collections are used 


--
--
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.

Reply via email to