Diff
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/ChangeLog (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/ChangeLog 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/ChangeLog 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1,3 +1,59 @@
+2021-03-02 Alan Coon <[email protected]>
+
+ Cherry-pick r273751. rdar://problem/74953144
+
+ [Cocoa] REGRESSION(r272752): fix some internal builds that use WTFString::WTFString(NSString *)
+ https://bugs.webkit.org/show_bug.cgi?id=222610
+ <rdar://74938249>
+
+ Unreviewed build fix.
+
+ Patch by BJ Burg <[email protected]> on 2021-03-02
+
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_method_implementation):
+ Some builders seem to find the new version of the header (without the exported NSString constructor)
+ whereas others don't find the new version (expecting the symbol to be exported), causing a linker error later on.
+
+ As a workaround, force usage of the CFStringRef constructor, which is always exported.
+
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ Rebaseline generator test results.
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273751 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-02 BJ Burg <[email protected]>
+
+ [Cocoa] REGRESSION(r272752): fix some internal builds that use WTFString::WTFString(NSString *)
+ https://bugs.webkit.org/show_bug.cgi?id=222610
+ <rdar://74938249>
+
+ Unreviewed build fix.
+
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+ (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_method_implementation):
+ Some builders seem to find the new version of the header (without the exported NSString constructor)
+ whereas others don't find the new version (expecting the symbol to be exported), causing a linker error later on.
+
+ As a workaround, force usage of the CFStringRef constructor, which is always exported.
+
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ Rebaseline generator test results.
+
2021-02-21 Lauro Moura <[email protected]>
Fix warning after r273225
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2021-03-03 03:09:26 UTC (rev 273804)
@@ -135,7 +135,7 @@
lines.append('{')
if isinstance(resolved_type, EnumType):
lines.append(' THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);')
- lines.append(' Optional<%(type)s> result = Inspector::fromProtocolString<%(type)s>(payload);' % {'type': self.objc_name_for_type(resolved_type)})
+ lines.append(' Optional<%(type)s> result = Inspector::fromProtocolString<%(type)s>((__bridge CFStringRef)payload);' % {'type': self.objc_name_for_type(resolved_type)})
lines.append(' THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"%s");' % declaration.type.raw_name())
lines.append(' *outValue = @(result.value());')
elif isinstance(resolved_type, (ArrayType, PrimitiveType)):
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1596,7 +1596,7 @@
+ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolDatabasePrimaryColors> result = Inspector::fromProtocolString<TestProtocolDatabasePrimaryColors>(payload);
+ Optional<TestProtocolDatabasePrimaryColors> result = Inspector::fromProtocolString<TestProtocolDatabasePrimaryColors>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"PrimaryColors");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1469,7 +1469,7 @@
+ (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolDatabasePrimaryColors> result = Inspector::fromProtocolString<TestProtocolDatabasePrimaryColors>(payload);
+ Optional<TestProtocolDatabasePrimaryColors> result = Inspector::fromProtocolString<TestProtocolDatabasePrimaryColors>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"PrimaryColors");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/enum-values.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1167,7 +1167,7 @@
+ (void)_parseEnum:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolTypeDomainEnum> result = Inspector::fromProtocolString<TestProtocolTypeDomainEnum>(payload);
+ Optional<TestProtocolTypeDomainEnum> result = Inspector::fromProtocolString<TestProtocolTypeDomainEnum>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"Enum");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -918,7 +918,7 @@
+ (void)_parseReason:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolDebuggerReason> result = Inspector::fromProtocolString<TestProtocolDebuggerReason>(payload);
+ Optional<TestProtocolDebuggerReason> result = Inspector::fromProtocolString<TestProtocolDebuggerReason>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"Reason");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -962,7 +962,7 @@
+ (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolRuntimeFarmAnimals> result = Inspector::fromProtocolString<TestProtocolRuntimeFarmAnimals>(payload);
+ Optional<TestProtocolRuntimeFarmAnimals> result = Inspector::fromProtocolString<TestProtocolRuntimeFarmAnimals>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"FarmAnimals");
*outValue = @(result.value());
}
@@ -970,7 +970,7 @@
+ (void)_parseTwoLeggedAnimals:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolRuntimeTwoLeggedAnimals> result = Inspector::fromProtocolString<TestProtocolRuntimeTwoLeggedAnimals>(payload);
+ Optional<TestProtocolRuntimeTwoLeggedAnimals> result = Inspector::fromProtocolString<TestProtocolRuntimeTwoLeggedAnimals>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"TwoLeggedAnimals");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1704,7 +1704,7 @@
+ (void)_parseMouseButton:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolDatabaseMouseButton> result = Inspector::fromProtocolString<TestProtocolDatabaseMouseButton>(payload);
+ Optional<TestProtocolDatabaseMouseButton> result = Inspector::fromProtocolString<TestProtocolDatabaseMouseButton>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"MouseButton");
*outValue = @(result.value());
}
Modified: branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (273803 => 273804)
--- branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2021-03-03 03:09:23 UTC (rev 273803)
+++ branches/safari-612.1.5-branch/Source/_javascript_Core/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2021-03-03 03:09:26 UTC (rev 273804)
@@ -1325,7 +1325,7 @@
+ (void)_parseUncastedAnimals:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolTestUncastedAnimals> result = Inspector::fromProtocolString<TestProtocolTestUncastedAnimals>(payload);
+ Optional<TestProtocolTestUncastedAnimals> result = Inspector::fromProtocolString<TestProtocolTestUncastedAnimals>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"UncastedAnimals");
*outValue = @(result.value());
}
@@ -1333,7 +1333,7 @@
+ (void)_parseCastedAnimals:(NSNumber **)outValue fromPayload:(id)payload
{
THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
- Optional<TestProtocolTestCastedAnimals> result = Inspector::fromProtocolString<TestProtocolTestCastedAnimals>(payload);
+ Optional<TestProtocolTestCastedAnimals> result = Inspector::fromProtocolString<TestProtocolTestCastedAnimals>((__bridge CFStringRef)payload);
THROW_EXCEPTION_FOR_BAD_ENUM_VALUE(result, @"CastedAnimals");
*outValue = @(result.value());
}
