Attachment 370708 Details for Bug 198256 – Patch for landing

[patch] Patch for landing

bug-198256-20190527232207.patch (text/plain), 4.14 KB, created by Tadeu Zagallo on 2019-05-27 14:22:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tadeu Zagallo

Created: 2019-05-27 14:22:08 PDT

Size: 4.14 KB

patch

obsolete

>Subversion Revision: 245778
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index df5adc4cc725fa461b2ac8974f772558f11a5455..45a0300745025ca0f5e98932e6de841246529e7f 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-26  Tadeu Zagallo  <tzagallo@apple.com>
>+
>+        Fix opensource build of testapi
>+        https://bugs.webkit.org/show_bug.cgi?id=198256
>+
>+        Reviewed by Alexey Proskuryakov.
>+
>+        In r245564, we added custom entitlements to testapi to allow caching
>+        bytecode in data vaults, but we should only use the entitlements for
>+        internal builds. Otherwises, testapi gets killed on launch. Also fix the
>+        formatting for the errors added in the same patch, according to comments
>+        in the bug after the patch had already landed.
>+
>+        * API/JSScript.mm:
>+        (validateBytecodeCachePath):
>+        * Configurations/ToolExecutable.xcconfig:
>+
> 2019-05-25  Tadeu Zagallo  <tzagallo@apple.com>
> 
>         JITOperations getByVal should mark negative array indices as out-of-bounds
>diff --git a/Source/JavaScriptCore/API/JSScript.mm b/Source/JavaScriptCore/API/JSScript.mm
>index b3ad037d686a9e4a5cab05a9984e87c45fba7276..411ddcd467d2be5eddbc32d4a656fff85af2ca6d 100644
>--- a/Source/JavaScriptCore/API/JSScript.mm
>+++ b/Source/JavaScriptCore/API/JSScript.mm
>@@ -77,25 +77,25 @@ static bool validateBytecodeCachePath(NSURL* cachePath, NSError** error)
> 
>     if (auto metadata = FileSystem::fileMetadata(systemPath)) {
>         if (metadata->type != FileMetadata::Type::File) {
>-            createError([NSString stringWithFormat:@"Cache path `%s` already exists and is not a file", systemPath.utf8().data()], error);
>+            createError([NSString stringWithFormat:@"Cache path `%@` already exists and is not a file", static_cast<NSString *>(systemPath)], error);
>             return false;
>         }
>     }
> 
>     String directory = FileSystem::directoryName(systemPath);
>     if (directory.isNull()) {
>-        createError([NSString stringWithFormat:@"Cache path `%s` does not contain in a valid directory", systemPath.utf8().data()], error);
>+        createError([NSString stringWithFormat:@"Cache path `%@` does not contain in a valid directory", static_cast<NSString *>(systemPath)], error);
>         return false;
>     }
> 
>     if (!FileSystem::fileIsDirectory(directory, FileSystem::ShouldFollowSymbolicLinks::No)) {
>-        createError([NSString stringWithFormat:@"Cache directory `%s` is not a directory or does not exist", directory.utf8().data()], error);
>+        createError([NSString stringWithFormat:@"Cache directory `%@` is not a directory or does not exist", static_cast<NSString *>(directory)], error);
>         return false;
>     }
> 
> #if USE(APPLE_INTERNAL_SDK)
>     if (rootless_check_datavault_flag(FileSystem::fileSystemRepresentation(directory).data(), nullptr)) {
>-        createError([NSString stringWithFormat:@"Cache directory `%s` is not a data vault", directory.utf8().data()], error);
>+        createError([NSString stringWithFormat:@"Cache directory `%@` is not a data vault", static_cast<NSString *>(directory)], error);
>         return false;
>     }
> #endif
>diff --git a/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig b/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
>index 263942d2253154a089f2c8eb77d2163002b7d21c..b8a9b28f11067e56f5e0238aa94998ab64f251b3 100644
>--- a/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig
>@@ -43,8 +43,8 @@ CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
> CODE_SIGN_IDENTITY_NO = -;
> CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
> 
>-CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_macosx_$(TARGET_NAME));
>-CODE_SIGN_ENTITLEMENTS_macosx_testapi = testapi.entitlements;
>+CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_macosx_$(TARGET_NAME)_$(USE_INTERNAL_SDK));
>+CODE_SIGN_ENTITLEMENTS_macosx_testapi_YES = testapi.entitlements;
> 
> CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));
> CODE_SIGN_ENTITLEMENTS_ios_minidom = entitlements.plist;

Actions: View | Formatted Diff | Diff

Attachments on bug 198256: 370649 | 370672 | 370708