Changeset 221097 in webkit

Timestamp:

Aug 23, 2017 1:14:37 PM (7 years ago)

Author:

ddkilzer@apple.com

Message:

Fix -Wcast-qual warnings in JavaScriptCore with new clang compiler
<​https://webkit.org/b/175889>
<rdar://problem/33667497>

Reviewed by Mark Lam.

• API/ObjCCallbackFunction.mm:

(JSC::objCCallbackFunctionCallAsConstructor): Use
const_cast<JSObjectRef>() since JSValueRef is const while
JSObjectRef is not.

• API/tests/CurrentThisInsideBlockGetterTest.mm:

(+[JSValue valueWithConstructorDescriptor:inContext:]): Use
const_cast<void*>() since JSObjectMake() takes a void*, but
CFBridgingRetain() returns const void*.

Location:

trunk/Source/JavaScriptCore

Files:

• API/ObjCCallbackFunction.mm (modified) (1 diff)
• API/tests/CurrentThisInsideBlockGetterTest.mm (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm

@@ -501 +501 @@
         return nullptr;
     }
-    return (JSObjectRef)result;
+    return const_cast<JSObjectRef>(result);
 }
 

trunk/Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.mm

@@ -83 +83 @@
     NSMutableDictionary *privateProperties = [@{ @"constructorDescriptor" : constructorDescriptor } mutableCopy];
     JSGlobalContextRef ctx = [context JSGlobalContextRef];
-    JSObjectRef constructorRef = JSObjectMake(ctx, ConstructorClass(), (void *)CFBridgingRetain(privateProperties));
+    JSObjectRef constructorRef = JSObjectMake(ctx, ConstructorClass(), const_cast<void*>(CFBridgingRetain(privateProperties)));
     JSValue *constructor = [JSValue valueWithJSValueRef:constructorRef inContext:context];
     return constructor;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-08-23  David Kilzer  <ddkilzer@apple.com>
+
+        Fix -Wcast-qual warnings in JavaScriptCore with new clang compiler
+        <https://webkit.org/b/175889>
+        <rdar://problem/33667497>
+
+        Reviewed by Mark Lam.
+
+        * API/ObjCCallbackFunction.mm:
+        (JSC::objCCallbackFunctionCallAsConstructor): Use
+        const_cast<JSObjectRef>() since JSValueRef is const while
+        JSObjectRef is not.
+        * API/tests/CurrentThisInsideBlockGetterTest.mm:
+        (+[JSValue valueWithConstructorDescriptor:inContext:]): Use
+        const_cast<void*>() since JSObjectMake() takes a void*, but
+        CFBridgingRetain() returns const void*.
+
 2017-08-23  Robin Morisset  <rmorisset@apple.com>