Changeset 81900 in webkit

Timestamp:

Mar 24, 2011 2:44:58 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-03-24 Oliver Hunt <​oliver@apple.com>

Reviewed by Geoffrey Garen.

REGRESSION (r79987-r80210): Crash in JSWeakObjectMapClear
​https://bugs.webkit.org/show_bug.cgi?id=55671

This is no longer necessary, and it seems that with the new weakmap
model it's simply unsafe, so this reduces it to a no-op.

• API/JSWeakObjectMapRefPrivate.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSWeakObjectMapRefPrivate.cpp (modified) (1 diff)
• API/JSWeakObjectMapRefPrivate.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp

@@ -69 +69 @@
 }
 
-bool JSWeakObjectMapClear(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef object)
+// We need to keep this function in the build to keep the nightlies running.
+JS_EXPORT bool JSWeakObjectMapClear(JSContextRef, JSWeakObjectMapRef, void*, JSObjectRef);
+bool JSWeakObjectMapClear(JSContextRef, JSWeakObjectMapRef, void*, JSObjectRef)
 {
-    ExecState* exec = toJS(ctx);
-    APIEntryShim entryShim(exec);
-    JSObject* obj = toJS(object);
-    if (map->map().deprecatedRemove(key, obj))
-        return true;
-    return false;
+    return true;
 }
 

trunk/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.h

@@ -77 +77 @@
 JS_EXPORT JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void* key);
 
-/*!
- @function
- @abstract Clears the association between a key and an object in a JSWeakObjectMapRef
- @param ctx The execution context to use.
- @param map The map to clear the key association from.
- @param key The key to use.
- @param object The old object value.
- @result Returns true if the key/object association was present in map, and has been removed.
- */
-JS_EXPORT bool JSWeakObjectMapClear(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef object);
-
 #ifdef __cplusplus
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        REGRESSION (r79987-r80210): Crash in JSWeakObjectMapClear
+        https://bugs.webkit.org/show_bug.cgi?id=55671
+
+        This is no longer necessary, and it seems that with the new weakmap
+        model it's simply unsafe, so this reduces it to a no-op. 
+
+        * API/JSWeakObjectMapRefPrivate.cpp:
+
 2011-03-24  Ben Taylor  <bentaylor.solx86@gmail.com>