Changeset 146711 in webkit

Timestamp:

Mar 22, 2013 9:20:21 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

testLeakingPrototypesAcrossContexts added in r146682 doesn't compile on Win and fails on Mac
​https://bugs.webkit.org/show_bug.cgi?id=113125

Reviewed by Mark Hahnenberg

Remove the test added in r146682 as it's now failing on Mac.
This is the test that was causing a compilation failure on Windows.

• API/tests/testapi.c:

(main):

Location:

trunk/Source/JavaScriptCore

Files:

• API/tests/testapi.c (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/tests/testapi.c

@@ -135 +135 @@
 }
 
-#if !OS(WINDOWS)
-static int leakedObject = 1;
-
-static void leakFinalize(JSObjectRef object)
-{
-    (void)object;
-    leakedObject = 0;
-}
-
-// This is a hack to avoid the C++ stack keeping the original JSObject alive.
-static void nestedAllocateObject(JSContextRef context, JSClassRef class, unsigned n)
-{
-    if (!n) {
-        JSObjectRef object = JSObjectMake(context, class, 0);
-        JSObjectRef globalObject = JSContextGetGlobalObject(context);
-        JSStringRef propertyName = JSStringCreateWithUTF8CString("value");
-        JSObjectSetProperty(context, globalObject, propertyName, object, kJSPropertyAttributeNone, 0);
-        JSStringRelease(propertyName);
-        return;
-    }
-    nestedAllocateObject(context, class, n - 1);
-}
-
-static void testLeakingPrototypesAcrossContexts()
-{
-    JSClassDefinition leakDefinition = kJSClassDefinitionEmpty;
-    leakDefinition.finalize = leakFinalize;
-    JSClassRef leakClass = JSClassCreate(&leakDefinition);
-
-    JSContextGroupRef group = JSContextGroupCreate();
-
-    {
-        JSGlobalContextRef context1 = JSGlobalContextCreateInGroup(group, NULL);
-        nestedAllocateObject(context1, leakClass, 10);
-        JSGlobalContextRelease(context1);
-    }
-
-    {
-        JSGlobalContextRef context2 = JSGlobalContextCreateInGroup(group, NULL);
-        JSObjectRef object2 = JSObjectMake(context2, leakClass, 0);
-        JSValueProtect(context2, object2);
-        JSSynchronousGarbageCollectForDebugging(context2);
-        if (leakedObject) {
-            printf("FAIL: Failed to finalize the original object after the first GC.\n");
-            failed = 1;
-        } else
-            printf("PASS: Finalized the original object as expected.\n");
-        JSValueUnprotect(context2, object2);
-        JSGlobalContextRelease(context2);
-    }
-
-    JSContextGroupRelease(group);
-
-    JSClassRelease(leakClass);
-}
-#endif
-
 static bool timeZoneIsPST()
 {
@@ -1745 +1688 @@
     }
 
-#if !OS(WINDOWS)
-    testLeakingPrototypesAcrossContexts();
-#endif
-
     // Clear out local variables pointing at JSObjectRefs to allow their values to be collected
     function = NULL;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-03-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+        testLeakingPrototypesAcrossContexts added in r146682 doesn't compile on Win and fails on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=113125
+
+        Reviewed by Mark Hahnenberg
+
+        Remove the test added in r146682 as it's now failing on Mac.
+        This is the test that was causing a compilation failure on Windows.
+
+        * API/tests/testapi.c:
+        (main):
+
 2013-03-22  Ryosuke Niwa  <rniwa@webkit.org>