Title: [271550] trunk
- Revision
- 271550
- Author
- [email protected]
- Date
- 2021-01-15 19:38:30 -0800 (Fri, 15 Jan 2021)
Log Message
Build fixes with newer clang
https://bugs.webkit.org/show_bug.cgi?id=220679
Reviewed by Mark Lam.
Source/_javascript_Core:
Class needs type casting to be used as map key in Objective-C. After https://reviews.llvm.org/D67983,
Objective-C++ also requires this (see discussion there for why it's OK to just cast).
* API/JSWrapperMap.mm: (-[JSWrapperMap classInfoForClass:]):
Tools:
* DumpRenderTree/mac/LayoutTestHelper.m:
(lockDownDiscreteGraphics):
(addSleepAssertions):
Added "static" to functions without prototypes.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/JSWrapperMap.mm (271549 => 271550)
--- trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2021-01-16 01:32:28 UTC (rev 271549)
+++ trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2021-01-16 03:38:30 UTC (rev 271550)
@@ -629,7 +629,7 @@
return nil;
// Check if we've already created a JSObjCClassInfo for this Class.
- if (JSObjCClassInfo* classInfo = (JSObjCClassInfo*)m_classMap[cls])
+ if (JSObjCClassInfo* classInfo = (JSObjCClassInfo*)m_classMap[(id)cls])
return classInfo;
// Skip internal classes beginning with '_' - just copy link to the parent class's info.
@@ -641,10 +641,10 @@
});
if (!conformsToExportProtocol)
- return m_classMap[cls] = [self classInfoForClass:class_getSuperclass(cls)];
+ return m_classMap[(id)cls] = [self classInfoForClass:class_getSuperclass(cls)];
}
- return m_classMap[cls] = [[[JSObjCClassInfo alloc] initForClass:cls] autorelease];
+ return m_classMap[(id)cls] = [[[JSObjCClassInfo alloc] initForClass:cls] autorelease];
}
- (JSValue *)jsWrapperForObject:(id)object inContext:(JSContext *)context
Modified: trunk/Source/_javascript_Core/ChangeLog (271549 => 271550)
--- trunk/Source/_javascript_Core/ChangeLog 2021-01-16 01:32:28 UTC (rev 271549)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-01-16 03:38:30 UTC (rev 271550)
@@ -1,3 +1,15 @@
+2021-01-15 Alexey Proskuryakov <[email protected]>
+
+ Build fixes with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=220679
+
+ Reviewed by Mark Lam.
+
+ Class needs type casting to be used as map key in Objective-C. After https://reviews.llvm.org/D67983,
+ Objective-C++ also requires this (see discussion there for why it's OK to just cast).
+
+ * API/JSWrapperMap.mm: (-[JSWrapperMap classInfoForClass:]):
+
2021-01-15 Yusuke Suzuki <[email protected]>
[JSC] Clean up DFGPreciseLocalClobberize to avoid duplicate code
Modified: trunk/Tools/ChangeLog (271549 => 271550)
--- trunk/Tools/ChangeLog 2021-01-16 01:32:28 UTC (rev 271549)
+++ trunk/Tools/ChangeLog 2021-01-16 03:38:30 UTC (rev 271550)
@@ -1,3 +1,15 @@
+2021-01-15 Alexey Proskuryakov <[email protected]>
+
+ Build fixes with newer clang
+ https://bugs.webkit.org/show_bug.cgi?id=220679
+
+ Reviewed by Mark Lam.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (lockDownDiscreteGraphics):
+ (addSleepAssertions):
+ Added "static" to functions without prototypes.
+
2021-01-15 Jonathan Bedard <[email protected]>
[webkitscmpy] Cache credentials from keychain
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (271549 => 271550)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2021-01-16 01:32:28 UTC (rev 271549)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2021-01-16 03:38:30 UTC (rev 271550)
@@ -216,7 +216,7 @@
exit(128 + sig);
}
-void lockDownDiscreteGraphics()
+static void lockDownDiscreteGraphics()
{
mach_port_t masterPort;
kern_return_t kernResult = IOMasterPort(bootstrap_port, &masterPort);
@@ -248,7 +248,7 @@
NSLog(@"IOObjectRelease() failed in %s with kernResult = %d", __FUNCTION__, kernResult);
}
-void addSleepAssertions()
+static void addSleepAssertions()
{
CFStringRef assertionName = CFSTR("WebKit LayoutTestHelper");
CFStringRef assertionDetails = CFSTR("WebKit layout-test helper tool is preventing sleep.");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
