Modified: trunk/Source/_javascript_Core/ChangeLog (273939 => 273940)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-05 02:57:55 UTC (rev 273939)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-05 04:17:40 UTC (rev 273940)
@@ -1,3 +1,16 @@
+2021-03-04 Alex Christensen <achristen...@webkit.org>
+
+ [Cocoa] REGRESSION(r272752): fix some internal builds that use WTFString::WTFString(NSString *)
+ https://bugs.webkit.org/show_bug.cgi?id=222610
+
+ Reviewed by Chris Dumez.
+
+ * inspector/scripts/codegen/objc_generator.py:
+ (ObjCGenerator.objc_protocol_import_expression_for_member):
+ (ObjCGenerator.objc_protocol_import_expression_for_parameter):
+ (ObjCGenerator.protocol_to_objc_expression_for_member):
+ (ObjCGenerator.payload_to_objc_expression_for_member):
+
2021-03-04 Saam Barati <sbar...@apple.com>
Don't trust parsing information to tell us if we've emitted op_call_eval
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (273939 => 273940)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-03-05 02:57:55 UTC (rev 273939)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-03-05 04:17:40 UTC (rev 273940)
@@ -390,8 +390,8 @@
def objc_protocol_import_expression_for_member(self, name, declaration, member):
if isinstance(member.type, EnumType):
if member.type.is_anonymous:
- return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), name)
- return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), name)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), name)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), name)
return self.objc_protocol_import_expression_for_variable(member.type, name)
def objc_protocol_import_expression_for_parameter(self, name, domain, event_or_command_name, parameter):
@@ -442,8 +442,8 @@
if category in [ObjCTypeCategory.Simple, ObjCTypeCategory.String]:
if isinstance(member.type, EnumType):
if member.type.is_anonymous:
- return 'fromProtocolString<%s>(%s).value()' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
- return 'fromProtocolString<%s>(%s).value()' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s).value()' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s).value()' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
return sub_expression
if category == ObjCTypeCategory.Object:
raise Exception("protocol_to_objc_expression_for_member does not support an Object type. See: protocol_to_objc_code_block_for_object_member")
@@ -487,9 +487,9 @@
if isinstance(member.type, EnumType):
sub_expression = 'payload[@"%s"]' % member.member_name
if member.type.is_anonymous:
- return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_anonymous_enum_member(declaration, member), sub_expression)
else:
- return 'fromProtocolString<%s>(%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
+ return 'fromProtocolString<%s>((__bridge CFStringRef)%s)' % (self.objc_enum_name_for_non_anonymous_enum(member.type), sub_expression)
if isinstance(_type, ObjectType):
objc_class = self.objc_class_for_type(member.type)
return '[[%s alloc] initWithPayload:payload[@"%s"]]' % (objc_class, member.member_name)
