Title: [221097] trunk/Source/_javascript_Core
- Revision
- 221097
- Author
- [email protected]
- Date
- 2017-08-23 13:14:37 -0700 (Wed, 23 Aug 2017)
Log Message
Fix -Wcast-qual warnings in _javascript_Core 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*.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm (221096 => 221097)
--- trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm 2017-08-23 20:05:44 UTC (rev 221096)
+++ trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm 2017-08-23 20:14:37 UTC (rev 221097)
@@ -500,7 +500,7 @@
*exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("Objective-C blocks called as constructors must return an object.")));
return nullptr;
}
- return (JSObjectRef)result;
+ return const_cast<JSObjectRef>(result);
}
const JSC::ClassInfo ObjCCallbackFunction::s_info = { "CallbackFunction", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(ObjCCallbackFunction) };
Modified: trunk/Source/_javascript_Core/API/tests/CurrentThisInsideBlockGetterTest.mm (221096 => 221097)
--- trunk/Source/_javascript_Core/API/tests/CurrentThisInsideBlockGetterTest.mm 2017-08-23 20:05:44 UTC (rev 221096)
+++ trunk/Source/_javascript_Core/API/tests/CurrentThisInsideBlockGetterTest.mm 2017-08-23 20:14:37 UTC (rev 221097)
@@ -82,7 +82,7 @@
{
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;
}
Modified: trunk/Source/_javascript_Core/ChangeLog (221096 => 221097)
--- trunk/Source/_javascript_Core/ChangeLog 2017-08-23 20:05:44 UTC (rev 221096)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-08-23 20:14:37 UTC (rev 221097)
@@ -1,3 +1,20 @@
+2017-08-23 David Kilzer <[email protected]>
+
+ Fix -Wcast-qual warnings in _javascript_Core 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 <[email protected]>
Make GetDynamicVar propagate heap predictions instead of saying HeapTop
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
