[webkit-changes] [295586] trunk/Source/WebKit/Configurations
Title: [295586] trunk/Source/WebKit/Configurations Revision 295586 Author msab...@apple.com Date 2022-06-15 22:49:13 -0700 (Wed, 15 Jun 2022) Log Message [Regression r295565] iOS Simulator build fails https://bugs.webkit.org/show_bug.cgi?id=241673 Unreviewed, fix ios simulator build after r295565. * Source/WebKit/Configurations/adattributiond.xcconfig: * Source/WebKit/Configurations/webpushd.xcconfig: Canonical link: https://commits.webkit.org/251591@main Modified Paths trunk/Source/WebKit/Configurations/adattributiond.xcconfig trunk/Source/WebKit/Configurations/webpushd.xcconfig Diff Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (295585 => 295586) --- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-06-16 05:31:25 UTC (rev 295585) +++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-06-16 05:49:13 UTC (rev 295586) @@ -47,6 +47,7 @@ LAUNCHD_PLIST_FILE_NAME = com.apple.webkit.adattributiond.plist -LAUNCHD_PLIST_INPUT_FILE[sdk=iphoneos*] = Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist +LAUNCHD_PLIST_INPUT_FILE = Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist +LAUNCHD_PLIST_INPUT_FILE[sdk=macos*] = ; LAUNCHD_PLIST_INSTALL_PATH = /System/Library/LaunchDaemons Modified: trunk/Source/WebKit/Configurations/webpushd.xcconfig (295585 => 295586) --- trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-06-16 05:31:25 UTC (rev 295585) +++ trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-06-16 05:49:13 UTC (rev 295586) @@ -50,7 +50,7 @@ LAUNCHD_PLIST_FILE_NAME = com.apple.webkit.webpushd.plist -LAUNCHD_PLIST_INPUT_FILE[sdk=iphoneos*] = webpushd/com.apple.webkit.webpushd.ios.plist +LAUNCHD_PLIST_INPUT_FILE = webpushd/com.apple.webkit.webpushd.ios.plist LAUNCHD_PLIST_INPUT_FILE[sdk=macos*] = webpushd/com.apple.webkit.webpushd.mac.plist LAUNCHD_PLIST_INSTALL_PATH = $(LAUNCHD_PLIST_INSTALL_PATH_$(USE_SYSTEM_CONTENT_PATH)) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [295565] trunk/Source/WebKit
Title: [295565] trunk/Source/WebKit
Revision 295565
Author msab...@apple.com
Date 2022-06-15 10:51:15 -0700 (Wed, 15 Jun 2022)
Log Message
Move webpushd and adattributiond to the secondary content path when configured
https://bugs.webkit.org/show_bug.cgi?id=241539
Reviewed by Keith Miller.
Moved webpushd and adattributiond and their plist files to the secondary content path when using
the system content path.
As part of this change, webpushd was moved to SYSTEM_SECONDARY_CONTENT_PATH/usr/libexec.
Created symlinks in /System/Library/{LaunchAgents|LaunchDaemons} for the plist files.
* Source/WebKit/Configurations/Base.xcconfig:
* Source/WebKit/Configurations/adattributiond.xcconfig:
* Source/WebKit/Configurations/webpushd.xcconfig:
* Source/WebKit/Scripts/copy-launchd-plist-and-create-symlink.sh: Added.
* Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/webpushd/com.apple.webkit.webpushd.ios.plist:
* Source/WebKit/webpushd/com.apple.webkit.webpushd.mac.plist:
Canonical link: https://commits.webkit.org/251570@main
Modified Paths
trunk/Source/WebKit/Configurations/Base.xcconfig
trunk/Source/WebKit/Configurations/adattributiond.xcconfig
trunk/Source/WebKit/Configurations/webpushd.xcconfig
trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
trunk/Source/WebKit/webpushd/com.apple.webkit.webpushd.ios.plist
trunk/Source/WebKit/webpushd/com.apple.webkit.webpushd.mac.plist
Added Paths
trunk/Source/WebKit/Scripts/copy-launchd-plist-and-create-symlink.sh
Diff
Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (295564 => 295565)
--- trunk/Source/WebKit/Configurations/Base.xcconfig 2022-06-15 17:06:12 UTC (rev 295564)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig 2022-06-15 17:51:15 UTC (rev 295565)
@@ -36,6 +36,9 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
+ENABLE_DAEMON_SYMLINKS = $(WK_NOT_$(USE_STAGING_INSTALL_PATH))
+ENABLE_DAEMON_SYMLINKS[sdk=embedded*] = NO
+
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = c++2a;
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (295564 => 295565)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-06-15 17:06:12 UTC (rev 295564)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-06-15 17:51:15 UTC (rev 295565)
@@ -41,3 +41,12 @@
FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR)
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
+
+SKIP_INSTALL = NO;
+SKIP_INSTALL[sdk=macos*] = YES;
+
+LAUNCHD_PLIST_FILE_NAME = com.apple.webkit.adattributiond.plist
+
+LAUNCHD_PLIST_INPUT_FILE[sdk=iphoneos*] = Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist
+
+LAUNCHD_PLIST_INSTALL_PATH = /System/Library/LaunchDaemons
Modified: trunk/Source/WebKit/Configurations/webpushd.xcconfig (295564 => 295565)
--- trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-06-15 17:06:12 UTC (rev 295564)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-06-15 17:51:15 UTC (rev 295565)
@@ -42,6 +42,22 @@
OTHER_CODE_SIGN_FLAGS[sdk=macos*] = $(OTHER_CODE_SIGN_FLAGS_$(USE_INTERNAL_SDK));
OTHER_CODE_SIGN_FLAGS_YES = --entitlements $(WK_PROCESSED_XCENT_FILE);
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
+INSTALL_PATH = $(INSTALL_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_YES = $(SYSTEM_SECONDARY_CONTENT_PATH)/usr/libexec;
+INSTALL_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/$(WK_FRAMEWORK_VERSION_PREFIX)Daemons;
SKIP_INSTALL = $(WK_SKIP_INSTALL_WEBPUSHD)
+
+LAUNCHD_PLIST_FILE_NAME = com.apple.webkit.webpushd.plist
+
+LAUNCHD_PLIST_INPUT_FILE[sdk=iphoneos*] = webpushd/com.apple.webkit.webpushd.ios.plist
+LAUNCHD_PLIST_INPUT_FILE[sdk=macos*] = webpushd/com.apple.webkit.webpushd.mac.plist
+
+LAUNCHD_PLIST_INSTALL_PATH = $(LAUNCHD_PLIST_INSTALL_PATH_$(USE_SYSTEM_CONTENT_PATH))
+LAUNCHD_PLIST_INSTALL_PATH_YES = /System/Library/LaunchDaemons
+LAUNCHD_PLIST_INSTALL_PATH_YES[sdk=macos*] = $(SYSTEM_SECONDARY_CONTENT_PATH)/System/Library/LaunchAgents
+
+LAUNCHD_PLIST_INSTALL_PATH_NO[sdk=macosx*] = /System/Library/LaunchAgents
+LAUNCHD_PLIST_INSTALL_PATH_NO = /System/Library/LaunchDaemons
+
+LAUNCHD_PLIST_SYMLINK_PATH[sdk=macos*] = /System/Library/LaunchAgents
Added: trunk/Source/WebKit/Scripts/copy-launchd-plist-and-create-symlink.sh (0 => 295565)
--- trunk/Source/WebKit/Scripts/copy-launchd-plist-and-create-symlink.sh (rev 0)
+++ trunk/Source/WebKit/Scripts/copy-launchd-plist-and-create-symlink.sh 2022-06-15 17:51:15 UTC (rev 295565)
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+if
[webkit-changes] [295066] trunk
Title: [295066] trunk
Revision 295066
Author msab...@apple.com
Date 2022-05-31 14:22:49 -0700 (Tue, 31 May 2022)
Log Message
ASSERTION FAILED: regExp->isValid() LLIntSlowPaths.cpp(625)
https://bugs.webkit.org/show_bug.cgi?id=241107
Reviewed by Mark Lam.
We can remove this ASSERT(regExp->isValid()) and others like it that are used for NewRegExp
bytecode processing because subsequent code already must handle the invalid case. These code
paths may create a new RegExp or retrieve a cached RegExp. For the case where a RegExp is
created for the first time it is valid or we wouldn't have generated the NewRegExp bytecode.
This valid RegExp can subsequently be marked with an error if it fails YARR RegExp engine JIT
code or interpreter bytecode generation. Matching with a RegExp with one of these generation
errors properly throws a Syntax error. These ASSERTs fail when the NewRegExp processing
retrieves an already cached RegExp, with a generation error. The matching code will still
throw a Syntax Error.
* JSTests/stress/regexp-late-compilation-error.js: Added.
(testRegExp1):
(testRegExp2):
(test):
* Source/_javascript_Core/dfg/DFGOperations.cpp:
(JSC::DFG::JSC_DEFINE_JIT_OPERATION):
* Source/_javascript_Core/jit/JITOperations.cpp:
(JSC::JSC_DEFINE_JIT_OPERATION):
* Source/_javascript_Core/llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
Canonical link: https://commits.webkit.org/251161@main
Modified Paths
trunk/Source/_javascript_Core/dfg/DFGOperations.cpp
trunk/Source/_javascript_Core/jit/JITOperations.cpp
trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp
Added Paths
trunk/JSTests/stress/regexp-late-compilation-error.js
Diff
Added: trunk/JSTests/stress/regexp-late-compilation-error.js (0 => 295066)
--- trunk/JSTests/stress/regexp-late-compilation-error.js (rev 0)
+++ trunk/JSTests/stress/regexp-late-compilation-error.js 2022-05-31 21:22:49 UTC (rev 295066)
@@ -0,0 +1,21 @@
+function testRegExp1()
+{
+/((a{1})*b{21})+/.test("b");
+}
+
+function testRegExp2()
+{
+/(a{10}b{10}|c{10009s}|)d{1094967295}e{15}/.test("abcde");
+}
+
+function test(testRE)
+{
+for (let i = 0; i < 5000; ++i) {
+try {
+testRE();
+} catch {};
+}
+}
+
+test(testRegExp1);
+test(testRegExp2);
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.cpp (295065 => 295066)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2022-05-31 21:18:44 UTC (rev 295065)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.cpp 2022-05-31 21:22:49 UTC (rev 295066)
@@ -2502,7 +2502,6 @@
JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
RegExp* regexp = static_cast(regexpPtr);
-ASSERT(regexp->isValid());
return RegExpObject::create(vm, globalObject->regExpStructure(), regexp, JSValue::decode(encodedLastIndex));
}
Modified: trunk/Source/_javascript_Core/jit/JITOperations.cpp (295065 => 295066)
--- trunk/Source/_javascript_Core/jit/JITOperations.cpp 2022-05-31 21:18:44 UTC (rev 295065)
+++ trunk/Source/_javascript_Core/jit/JITOperations.cpp 2022-05-31 21:22:49 UTC (rev 295066)
@@ -1821,7 +1821,6 @@
JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
RegExp* regexp = static_cast(regexpPtr);
-ASSERT(regexp->isValid());
static constexpr bool areLegacyFeaturesEnabled = true;
return RegExpObject::create(vm, globalObject->regExpStructure(), regexp, areLegacyFeaturesEnabled);
}
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (295065 => 295066)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2022-05-31 21:18:44 UTC (rev 295065)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2022-05-31 21:22:49 UTC (rev 295066)
@@ -622,7 +622,6 @@
LLINT_BEGIN();
auto bytecode = pc->as();
RegExp* regExp = jsCast(getOperand(callFrame, bytecode.m_regexp));
-ASSERT(regExp->isValid());
static constexpr bool areLegacyFeaturesEnabled = true;
LLINT_RETURN(RegExpObject::create(vm, globalObject->regExpStructure(), regExp, areLegacyFeaturesEnabled));
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [294411] trunk
Title: [294411] trunk
Revision 294411
Author msab...@apple.com
Date 2022-05-18 11:33:44 -0700 (Wed, 18 May 2022)
Log Message
WTF::CrashOnOverflow::crash() with /((a{1})*b{21})+/.test();
https://bugs.webkit.org/show_bug.cgi?id=240552
Reviewed by Yusuke Suzuki and Alex Christensen.
Replaced a crashing checked add in the YARR JIT code generator with a reporting add so we can
catch the overflow. When we do overflow, we terminate the JIT genration with an error.
We'll fallback to the YARR interpreter, which already exits with an error on a similar overflow.
* JSTests/stress/regexp-large-quantifier.js:
(testRegExp):
* Source/_javascript_Core/yarr/YarrJIT.cpp:
(JSC::Yarr::dumpCompileFailure):
* Source/_javascript_Core/yarr/YarrJIT.h:
Canonical link: https://commits.webkit.org/250703@main
Modified Paths
trunk/JSTests/stress/regexp-large-quantifier.js
trunk/Source/_javascript_Core/yarr/YarrJIT.cpp
trunk/Source/_javascript_Core/yarr/YarrJIT.h
Diff
Modified: trunk/JSTests/stress/regexp-large-quantifier.js (294410 => 294411)
--- trunk/JSTests/stress/regexp-large-quantifier.js 2022-05-18 18:17:11 UTC (rev 294410)
+++ trunk/JSTests/stress/regexp-large-quantifier.js 2022-05-18 18:33:44 UTC (rev 294411)
@@ -1,6 +1,16 @@
-function testRegExp(pattern, string, expectedMatch) {
+function testRegExp(pattern, string, expectedParseError, expectedMatch) {
const r = new RegExp(pattern);
-const actualResult = r.exec(string);
+let actualResult = null;
+let actualParseError = null;
+try {
+actualResult = r.exec(string);
+} catch(e) {
+actualParseError = e;
+}
+
+if (expectedParseError && expectedParseError != actualParseError)
+throw("Expected \"" + expectedParseError + "\", but got \"" + actualParseError + "\"");
+
if (expectedMatch === undefined) {
if (actualResult !== null)
throw("Expected " + r + ".exec(\"" + string + "\") to be null");
@@ -10,7 +20,8 @@
}
}
-testRegExp("a{0,4294967295}", "a", "a");
-testRegExp("a{0,4294967296}", "a", "a");
-testRegExp("^a{0,4294967296}$", "a{0,4294967296}", undefined);
-testRegExp("(?:a{0,340282366920}?){0,1}a", "aa", "aa");
+testRegExp("a{0,4294967295}", "a", undefined, "a");
+testRegExp("a{0,4294967296}", "a", undefined, "a");
+testRegExp("^a{0,4294967296}$", "a{0,4294967296}", undefined, undefined);
+testRegExp("(?:a{0,340282366920}?){0,1}a", "aa", undefined, "aa");
+testRegExp("((.{1})*.{21})+", "x", "SyntaxError: Invalid regular _expression_: pattern exceeds string length limits", undefined);
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (294410 => 294411)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2022-05-18 18:17:11 UTC (rev 294410)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2022-05-18 18:33:44 UTC (rev 294411)
@@ -3596,7 +3596,16 @@
lastOp.m_checkAdjust = nestedAlternative->m_minimumSize;
if ((term->quantityType == QuantifierType::FixedCount) && (term->type != PatternTerm::Type::ParentheticalAssertion))
lastOp.m_checkAdjust -= disjunction->m_minimumSize;
-lastOp.m_checkedOffset = checkedOffset + lastOp.m_checkAdjust;
+
+Checked checkedOffsetResult(checkedOffset);
+checkedOffsetResult += lastOp.m_checkAdjust;
+
+if (UNLIKELY(checkedOffsetResult.hasOverflowed())) {
+m_failureReason = JITFailureReason::OffsetTooLarge;
+return;
+}
+
+lastOp.m_checkedOffset = checkedOffsetResult;
}
opCompileAlternative(m_ops[lastOpIndex].m_checkedOffset, nestedAlternative);
@@ -4721,6 +4730,9 @@
case JITFailureReason::ExecutableMemoryAllocationFailure:
dataLog("Can't JIT because of failure of allocation of executable memory\n");
break;
+case JITFailureReason::OffsetTooLarge:
+dataLog("Can't JIT because pattern exceeds string length limits\n");
+break;
}
}
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.h (294410 => 294411)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.h 2022-05-18 18:17:11 UTC (rev 294410)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.h 2022-05-18 18:33:44 UTC (rev 294411)
@@ -62,6 +62,7 @@
FixedCountParenthesizedSubpattern,
ParenthesisNestedTooDeep,
ExecutableMemoryAllocationFailure,
+OffsetTooLarge,
};
class BoyerMooreFastCandidates {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [294072] trunk/Source/WebKit
Title: [294072] trunk/Source/WebKit
Revision 294072
Author msab...@apple.com
Date 2022-05-11 14:41:42 -0700 (Wed, 11 May 2022)
Log Message
Need to add DYLD_LIBRARY_PATH for XPC services
https://bugs.webkit.org/show_bug.cgi?id=240289
Reviewed by Alexey Proskuryakov.
Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
* Configurations/BaseTarget.xcconfig:
* webpushd/webpushtool/WebPushToolMain.mm:
(registerDaemonWithLaunchD):
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm
Diff
Modified: trunk/Source/WebKit/ChangeLog (294071 => 294072)
--- trunk/Source/WebKit/ChangeLog 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/ChangeLog 2022-05-11 21:41:42 UTC (rev 294072)
@@ -1,3 +1,17 @@
+2022-05-11 Michael Saboff
+
+Need to add DYLD_LIBRARY_PATH for XPC services
+https://bugs.webkit.org/show_bug.cgi?id=240289
+
+Reviewed by Alexey Proskuryakov.
+
+Set DYLD_LIBRARY_PATH / DYLD_VERSIONED_LIBRARY_PATH for XPC services depending on the value of USE_STAGING_INSTALL_PATH.
+Also added DYLD_LIBRARY_PATH to the XPC environment for webpushd.
+
+* Configurations/BaseTarget.xcconfig:
+* webpushd/webpushtool/WebPushToolMain.mm:
+(registerDaemonWithLaunchD):
+
2022-05-11 Per Arne Vollan
[WP] Remove obsolete message filters
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (294071 => 294072)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-11 21:41:42 UTC (rev 294072)
@@ -125,8 +125,8 @@
WEBKIT_LEGACY_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebKitLegacy.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(USE_STAGING_INSTALL_PATH));
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
-OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_VERSIONED_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
+OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari,-dyld_env,DYLD_LIBRARY_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm (294071 => 294072)
--- trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-11 21:37:13 UTC (rev 294071)
+++ trunk/Source/WebKit/webpushd/webpushtool/WebPushToolMain.mm 2022-05-11 21:41:42 UTC (rev 294072)
@@ -106,6 +106,7 @@
{
auto environmentVariables = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
xpc_dictionary_set_string(environmentVariables.get(), "DYLD_FRAMEWORK_PATH", currentExecutableDirectoryURL.fileSystemRepresentation);
+xpc_dictionary_set_string(environmentVariables.get(), "DYLD_LIBRARY_PATH", currentExecutableDirectoryURL.fileSystemRepresentation);
xpc_dictionary_set_value(plist.get(), "EnvironmentVariables", environmentVariables.get());
}
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [293794] trunk/Source/WebCore
Title: [293794] trunk/Source/WebCore Revision 293794 Author msab...@apple.com Date 2022-05-04 14:55:48 -0700 (Wed, 04 May 2022) Log Message [Mac] WebCore should search system content path for nested Frameworks https://bugs.webkit.org/show_bug.cgi?id=240063 Reviewed by Alexey Proskuryakov. Changed nested frameworks directory to be below where WebCore will be installed when building with the system content path. * Configurations/WebCore.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (293793 => 293794) --- trunk/Source/WebCore/ChangeLog 2022-05-04 21:23:48 UTC (rev 293793) +++ trunk/Source/WebCore/ChangeLog 2022-05-04 21:55:48 UTC (rev 293794) @@ -1,3 +1,15 @@ +2022-05-04 Michael Saboff + +[Mac] WebCore should search system content path for nested Frameworks +https://bugs.webkit.org/show_bug.cgi?id=240063 + +Reviewed by Alexey Proskuryakov. + +Changed nested frameworks directory to be below where WebCore will be installed +when building with the system content path. + +* Configurations/WebCore.xcconfig: + 2022-05-04 Kate Cheney REGRESSION (r293427): [ iOS ] http/tests/quicklook/same-origin-xmlhttprequest-allowed.html is a constant crash and failure (240024) Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (293793 => 293794) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-04 21:23:48 UTC (rev 293793) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-04 21:55:48 UTC (rev 293794) @@ -61,9 +61,9 @@ WK_FRAMEWORKS_LIBRARY_DIR = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks WK_FRAMEWORKS_LIBRARY_DIR[sdk=macosx*] = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)) WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); -WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; +WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; WK_FRAMEWORKS_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); -WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; +WK_FRAMEWORKS_LIBRARY_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_FRAMEWORKS_LIBRARY_DIR)"; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [293724] trunk/Source/WebInspectorUI
Title: [293724] trunk/Source/WebInspectorUI
Revision 293724
Author msab...@apple.com
Date 2022-05-03 07:31:34 -0700 (Tue, 03 May 2022)
Log Message
WebInspectorUI is missing a symlink to system content path
https://bugs.webkit.org/show_bug.cgi?id=239971
Reviewed by Alexey Proskuryakov.
Enabled script execution for install headers phase.
Added checks to run Copy User Interface Resources script only during the install phase.
* Configurations/WebInspectorUIFramework.xcconfig:
* WebInspectorUI.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig
trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (293723 => 293724)
--- trunk/Source/WebInspectorUI/ChangeLog 2022-05-03 14:16:55 UTC (rev 293723)
+++ trunk/Source/WebInspectorUI/ChangeLog 2022-05-03 14:31:34 UTC (rev 293724)
@@ -1,3 +1,16 @@
+2022-05-03 Michael Saboff
+
+WebInspectorUI is missing a symlink to system content path
+https://bugs.webkit.org/show_bug.cgi?id=239971
+
+Reviewed by Alexey Proskuryakov.
+
+Enabled script execution for install headers phase.
+Added checks to run Copy User Interface Resources script only during the install phase.
+
+* Configurations/WebInspectorUIFramework.xcconfig:
+* WebInspectorUI.xcodeproj/project.pbxproj:
+
2022-04-21 Dan Glastonbury
WebInspector: Improve rendering of GLbitfield in WebGL canvas recordings.
Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (293723 => 293724)
--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-05-03 14:16:55 UTC (rev 293723)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-05-03 14:31:34 UTC (rev 293724)
@@ -17,6 +17,8 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
+INSTALLHDRS_SCRIPT_PHASE = YES;
+
DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
PRODUCT_NAME = WebInspectorUI;
PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj (293723 => 293724)
--- trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2022-05-03 14:16:55 UTC (rev 293723)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj 2022-05-03 14:31:34 UTC (rev 293724)
@@ -177,7 +177,7 @@
name = "Copy User Interface Resources";
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"\n";
+ shellScript = "if [[ \"${ACTION}\" == \"installapi\" || \"${ACTION}\" == \"installhdrs\" ]]; then\nexit\nfi\n\n/usr/bin/perl \"${SRCROOT}/Scripts/copy-user-interface-resources.pl\"\n";
};
6517571727C9AD6B00D9FE40 /* Copy Frameworks to Secondary Path */ = {
isa = PBXShellScriptBuildPhase;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [293558] trunk/Source/WebGPU
Title: [293558] trunk/Source/WebGPU Revision 293558 Author msab...@apple.com Date 2022-04-27 20:04:58 -0700 (Wed, 27 Apr 2022) Log Message WebGPU doesn't create a symlink to the system content path in installhdrs https://bugs.webkit.org/show_bug.cgi?id=239819 Reviewed by Alexey Proskuryakov. Enabled script phases for installhdrs and installapi. * Configurations/WebGPU.xcconfig: Modified Paths trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig Diff Modified: trunk/Source/WebGPU/ChangeLog (293557 => 293558) --- trunk/Source/WebGPU/ChangeLog 2022-04-28 03:03:33 UTC (rev 293557) +++ trunk/Source/WebGPU/ChangeLog 2022-04-28 03:04:58 UTC (rev 293558) @@ -1,3 +1,14 @@ +2022-04-27 Michael Saboff + +WebGPU doesn't create a symlink to the system content path in installhdrs +https://bugs.webkit.org/show_bug.cgi?id=239819 + +Reviewed by Alexey Proskuryakov. + +Enabled script phases for installhdrs and installapi. + +* Configurations/WebGPU.xcconfig: + 2022-04-20 Myles C. Maxfield [WebGPU] Expand hardware capabilities to include features (beyond just limits) Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (293557 => 293558) --- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-28 03:03:33 UTC (rev 293557) +++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-28 03:04:58 UTC (rev 293558) @@ -59,6 +59,8 @@ OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); +INSTALLHDRS_SCRIPT_PHASE = YES; + PRODUCT_NAME = WebGPU; PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [293043] trunk
Title: [293043] trunk Revision 293043 Author msab...@apple.com Date 2022-04-19 16:23:24 -0700 (Tue, 19 Apr 2022) Log Message Various WebKit tools need to be told about the system content path https://bugs.webkit.org/show_bug.cgi?id=239516 Reviewed by Ryan Haddad. Source/_javascript_Core: Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for TestAPI and the JSC tools. This will contain the system content path prefix when enabled. * Configurations/TestAPI.xcconfig: * Configurations/ToolExecutable.xcconfig: Tools: Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for the webkit test tools. This will contain the system content path prefix when enabled. * DumpRenderTree/mac/Configurations/Base.xcconfig: * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig: * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig trunk/Tools/ChangeLog trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (293042 => 293043) --- trunk/Source/_javascript_Core/ChangeLog 2022-04-19 23:13:45 UTC (rev 293042) +++ trunk/Source/_javascript_Core/ChangeLog 2022-04-19 23:23:24 UTC (rev 293043) @@ -1,3 +1,16 @@ +2022-04-19 Michael Saboff + +Various WebKit tools need to be told about the system content path +https://bugs.webkit.org/show_bug.cgi?id=239516 + +Reviewed by Ryan Haddad. + +Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for TestAPI and the JSC tools. +This will contain the system content path prefix when enabled. + +* Configurations/TestAPI.xcconfig: +* Configurations/ToolExecutable.xcconfig: + 2022-04-19 Yusuke Suzuki REGRESSION(r292372): cloop crashes on s390x Modified: trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig (293042 => 293043) --- trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig 2022-04-19 23:13:45 UTC (rev 293042) +++ trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig 2022-04-19 23:23:24 UTC (rev 293043) @@ -24,7 +24,7 @@ #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig" #include "Version.xcconfig" -INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); +INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); PRODUCT_NAME = $(TARGET_NAME); USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (293042 => 293043) --- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2022-04-19 23:13:45 UTC (rev 293042) +++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2022-04-19 23:23:24 UTC (rev 293043) @@ -24,7 +24,7 @@ #include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig" #include "Version.xcconfig" -INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); +INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR); PRODUCT_NAME = $(TARGET_NAME); USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); Modified: trunk/Tools/ChangeLog (293042 => 293043) --- trunk/Tools/ChangeLog 2022-04-19 23:13:45 UTC (rev 293042) +++ trunk/Tools/ChangeLog 2022-04-19 23:23:24 UTC (rev 293043) @@ -1,3 +1,20 @@ +2022-04-19 Michael Saboff + +Various WebKit tools need to be told about the system content path +https://bugs.webkit.org/show_bug.cgi?id=239516 + +Reviewed by Ryan Haddad. + +Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for the webkit test tools. +This will contain the system content path prefix when enabled. + +* DumpRenderTree/mac/Configurations/Base.xcconfig: +* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: +* DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig: +* DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig: +* WebKitTestRunner/Configurations/Base.xcconfig: +* WebKitTestRunner/Configurations/BaseTarget.xcconfig: + 2022-04-19 Jonathan Bedard [ews-build.webkit.org] GitHub usernames are case insensitive Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
[webkit-changes] [292758] trunk/Source/ThirdParty/libwebrtc
Title: [292758] trunk/Source/ThirdParty/libwebrtc
Revision 292758
Author msab...@apple.com
Date 2022-04-11 20:34:04 -0700 (Mon, 11 Apr 2022)
Log Message
REGRESSION (r292411): libwebrtc header files aren't installed in system content path
https://bugs.webkit.org/show_bug.cgi?id=239100
Reviewed by Mark Lam.
Restored System Content Path processing for absl and webrtc header files.
* Configurations/libabsl.xcconfig:
* Configurations/libwebrtc.xcconfig:
Modified Paths
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (292757 => 292758)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-12 03:34:04 UTC (rev 292758)
@@ -1,3 +1,15 @@
+2022-04-11 Michael Saboff
+
+REGRESSION (r292411): libwebrtc header files aren't installed in system content path
+https://bugs.webkit.org/show_bug.cgi?id=239100
+
+Reviewed by Mark Lam.
+
+Restored System Content Path processing for absl and webrtc header files.
+
+* Configurations/libabsl.xcconfig:
+* Configurations/libwebrtc.xcconfig:
+
2022-04-08 Elliott Williams
[Xcode] Avoid targeting 32-bit iOS and Mac architectures
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig (292757 => 292758)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-04-12 03:34:04 UTC (rev 292758)
@@ -23,7 +23,10 @@
PRODUCT_NAME = absl;
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
+
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PUBLIC_HEADERS_FOLDER_PATH_not_legacy = /usr/local/include/absl;
+PUBLIC_HEADERS_FOLDER_PATH_not_legacy = $(INSTALL_PATH_PREFIX)/usr/local/include/absl;
PUBLIC_HEADERS_FOLDER_PATH_legacy = /usr/local/include/absl_flattened;
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (292757 => 292758)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-12 03:00:18 UTC (rev 292757)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-12 03:34:04 UTC (rev 292758)
@@ -70,7 +70,7 @@
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PUBLIC_HEADERS_FOLDER_PATH_not_legacy = ${PUBLIC_HEADERS_FOLDER_PREFIX}/webrtc;
+PUBLIC_HEADERS_FOLDER_PATH_not_legacy = ${INSTALL_PUBLIC_HEADER_PREFIX}/webrtc;
PUBLIC_HEADERS_FOLDER_PATH_legacy = ${PUBLIC_HEADERS_FOLDER_PREFIX}/webrtc_flattened;
USE_HEADERMAP = NO;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [292258] trunk/Source
Title: [292258] trunk/Source Revision 292258 Author msab...@apple.com Date 2022-04-01 22:18:40 -0700 (Fri, 01 Apr 2022) Log Message Stop copying StagedFrameworks to the secondary path by default https://bugs.webkit.org/show_bug.cgi?id=238688 Reviewed by Saam Barati. Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't always copy frameworks to the secondary path on macOS. Instead, the build configuration can set COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/libwebrtc.xcconfig: Source/WebCore: * Configurations/WebCore.xcconfig: Source/WebGPU: * Configurations/WebGPU.xcconfig: Source/WebInspectorUI: * Configurations/WebInspectorUIFramework.xcconfig: Source/WebKit: * Configurations/Base.xcconfig: Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (292257 => 292258) --- trunk/Source/_javascript_Core/ChangeLog 2022-04-02 03:53:27 UTC (rev 292257) +++ trunk/Source/_javascript_Core/ChangeLog 2022-04-02 05:18:40 UTC (rev 292258) @@ -1,3 +1,16 @@ +2022-04-01 Michael Saboff + +Stop copying StagedFrameworks to the secondary path by default +https://bugs.webkit.org/show_bug.cgi?id=238688 + +Reviewed by Saam Barati. + +Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't +always copy frameworks to the secondary path on macOS. Instead, the build configuration can set +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate. + +* Configurations/Base.xcconfig: + 2022-04-01 Jeff Miller WKBundlePageUIClient console message support should include source URL, column number, and console messages with arguments Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (292257 => 292258) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-04-02 03:53:27 UTC (rev 292257) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-04-02 05:18:40 UTC (rev 292258) @@ -37,7 +37,6 @@ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT)); COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH) ALWAYS_SEARCH_USER_PATHS = NO; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (292257 => 292258) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-04-02 03:53:27 UTC (rev 292257) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-04-02 05:18:40 UTC (rev 292258) @@ -1,3 +1,16 @@ +2022-04-01 Michael Saboff + +Stop copying StagedFrameworks to the secondary path by default +https://bugs.webkit.org/show_bug.cgi?id=238688 + +Reviewed by Saam Barati. + +Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't +always copy frameworks to the secondary path on macOS. Instead, the build configuration can set +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate. + +* Configurations/ANGLE-dynamic.xcconfig: + 2022-03-29 Kenneth Russell Handle pkg_config and declare_args statements in gni-to-cmake.py Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (292257 => 292258) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-04-02 03:53:27 UTC (rev 292257) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-04-02 05:18:40 UTC (rev 292258) @@ -21,7 +21,6 @@ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT)); COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH) INSTALL_PATH =
[webkit-changes] [291869] trunk/Source/WebKit
Title: [291869] trunk/Source/WebKit
Revision 291869
Author msab...@apple.com
Date 2022-03-25 11:39:20 -0700 (Fri, 25 Mar 2022)
Log Message
Unreviewed, fix the internal iOS build after r291814
rdar://90848250
Removed extraneous double quote (") in com.apple.WebKit.WebContent.sb.in.
* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in
Diff
Modified: trunk/Source/WebKit/ChangeLog (291868 => 291869)
--- trunk/Source/WebKit/ChangeLog 2022-03-25 18:29:53 UTC (rev 291868)
+++ trunk/Source/WebKit/ChangeLog 2022-03-25 18:39:20 UTC (rev 291869)
@@ -1,3 +1,12 @@
+2022-03-25 Michael Saboff
+
+Unreviewed, fix the internal iOS build after r291814
+rdar://90848250
+
+Removed extraneous double quote (") in com.apple.WebKit.WebContent.sb.in.
+
+* Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in:
+
2022-03-25 Chris Dumez
Start preparing WebCore for making the String(const char*) constructor explicit
Modified: trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in (291868 => 291869)
--- trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2022-03-25 18:29:53 UTC (rev 291868)
+++ trunk/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb.in 2022-03-25 18:39:20 UTC (rev 291869)
@@ -1664,7 +1664,7 @@
(apply subpath file-read-existence-secondary-paths))
(allow file-map-executable
-(apply subpath "secondary-framework-and-dylib-paths))
+(apply subpath secondary-framework-and-dylib-paths))
(allow-read-and-issue-generic-extensions
(apply subpath issue-extension-secondary-paths))
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291828] trunk/Source/WebKit
Title: [291828] trunk/Source/WebKit
Revision 291828
Author msab...@apple.com
Date 2022-03-24 16:38:35 -0700 (Thu, 24 Mar 2022)
Log Message
After r291814, we need to create the INSTALL_PATH for the iOS sandbox files
https://bugs.webkit.org/show_bug.cgi?id=238351
Reviewed by Saam Barati.
We need to create the $(INSTALL_PATH) for the preprocessed iOS sandbox files.
Before r291814, the built-in Xcode copy step used ditto when copying the .sb
files thus creating $(INSTALL_PATH) and its intermediate directories.
That change set made it so that all WebKit iOS sandbox profile files are preprocessed
thus eliminating the Xcode copy step.
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (291827 => 291828)
--- trunk/Source/WebKit/ChangeLog 2022-03-24 23:38:30 UTC (rev 291827)
+++ trunk/Source/WebKit/ChangeLog 2022-03-24 23:38:35 UTC (rev 291828)
@@ -1,3 +1,18 @@
+2022-03-24 Michael Saboff
+
+After r291814, we need to create the INSTALL_PATH for the iOS sandbox files
+https://bugs.webkit.org/show_bug.cgi?id=238351
+
+Reviewed by Saam Barati.
+
+We need to create the $(INSTALL_PATH) for the preprocessed iOS sandbox files.
+Before r291814, the built-in Xcode copy step used ditto when copying the .sb
+files thus creating $(INSTALL_PATH) and its intermediate directories.
+That change set made it so that all WebKit iOS sandbox profile files are preprocessed
+thus eliminating the Xcode copy step.
+
+* WebKit.xcodeproj/project.pbxproj:
+
2022-03-24 Patrick Angle
REGRESSION(STP142): "A _javascript_ exception occured: Can't find variable: utils" from SafariDriver
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (291827 => 291828)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-03-24 23:38:30 UTC (rev 291827)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-03-24 23:38:35 UTC (rev 291828)
@@ -16808,7 +16808,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "echo \"Preprocessing sandbox\"\nScripts/generate-derived-sources.sh sandbox-profiles-ios\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.adattributiond.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.GPU.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.Networking.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebAuth.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebContent.sb ${DSTROOT}/${INSTALL_PATH}\n";
+ shellScript = "echo \"Preprocessing sandbox\"\nScripts/generate-derived-sources.sh sandbox-profiles-ios\nmkdir -p ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.adattributiond.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.GPU.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.Networking.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebAuth.sb ${DSTROOT}/${INSTALL_PATH}\ncp ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/com.apple.WebKit.WebContent.sb ${DSTROOT}/${INSTALL_PATH}\n";
};
/* End PBXShellScriptBuildPhase section */
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291455] trunk/Source
Title: [291455] trunk/Source Revision 291455 Author msab...@apple.com Date 2022-03-17 17:46:15 -0700 (Thu, 17 Mar 2022) Log Message libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path https://bugs.webkit.org/show_bug.cgi?id=238058 Reviewed by Mark Lam. Source/ThirdParty/ANGLE: We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds. We want to allow executables to use the framework via the symlink from the old location. * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds. We want to allow executables to use the framework via the symlink from the old location. * Configurations/libwebrtc.xcconfig: Source/WebGPU: We need to set DYLIB_INSTALL_NAME_BASE for WK_USE_ALTERNATE_FRAMEWORKS_DIR installs without the system content path prefix. We want to allow executables to use the framework via the symlink from the old location. * Configurations/WebGPU.xcconfig: Modified Paths trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig Diff Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (291454 => 291455) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-18 00:18:32 UTC (rev 291454) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-18 00:46:15 UTC (rev 291455) @@ -1,3 +1,15 @@ +2022-03-17 Michael Saboff + +libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path +https://bugs.webkit.org/show_bug.cgi?id=238058 + +Reviewed by Mark Lam. + +We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds. +We want to allow executables to use the framework via the symlink from the old location. + +* Configurations/ANGLE-dynamic.xcconfig: + 2022-03-14 Kimmo Kinnunen REGRESSION (iOS 15.4 beta) - WebGL yields incorrect results when using preserveDrawingBuffer on iOS 15.4 Beta Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (291454 => 291455) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-18 00:18:32 UTC (rev 291454) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-18 00:46:15 UTC (rev 291455) @@ -30,6 +30,7 @@ INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; +DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS)); DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (291454 => 291455) --- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-18 00:18:32 UTC (rev 291454) +++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-18 00:46:15 UTC (rev 291455) @@ -1,3 +1,15 @@ +2022-03-17 Michael Saboff + +libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path +https://bugs.webkit.org/show_bug.cgi?id=238058 + +Reviewed by Mark Lam. + +We need to create a default value for DYLIB_INSTALL_NAME_BASE for iOS builds. +We want to allow executables to use the framework via the symlink from the old location. + +* Configurations/libwebrtc.xcconfig: + 2022-03-17 Youenn Fablet Remove no longer used third party webrtc modules Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (291454 => 291455) --- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-18 00:18:32 UTC (rev 291454) +++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-18 00:46:15 UTC (rev 291455) @@ -45,6 +45,7 @@ INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); +DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
[webkit-changes] [291184] trunk/Source/WebGPU
Title: [291184] trunk/Source/WebGPU Revision 291184 Author msab...@apple.com Date 2022-03-11 13:08:46 -0800 (Fri, 11 Mar 2022) Log Message WebGPU Catalyst builds fail when using the system content path https://bugs.webkit.org/show_bug.cgi?id=237790 Reviewed by Saam Barati. The value of ALTERNATE_ROOT_PATH should be set to the framework directory instead of DYLIB_INSTALL_NAME_BASE since it will include the system content path as a prefix for Catalyst builds. This is similar to the construction of ALTERNATE_ROOT_PATH for the other frameworks. * Configurations/WebGPU.xcconfig: Modified Paths trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig Diff Modified: trunk/Source/WebGPU/ChangeLog (291183 => 291184) --- trunk/Source/WebGPU/ChangeLog 2022-03-11 21:07:19 UTC (rev 291183) +++ trunk/Source/WebGPU/ChangeLog 2022-03-11 21:08:46 UTC (rev 291184) @@ -1,3 +1,17 @@ +2022-03-11 Michael Saboff + +WebGPU Catalyst builds fail when using the system content path +https://bugs.webkit.org/show_bug.cgi?id=237790 + +Reviewed by Saam Barati. + +The value of ALTERNATE_ROOT_PATH should be set to the framework directory instead of +DYLIB_INSTALL_NAME_BASE since it will include the system content path as a prefix for +Catalyst builds. + This is similar to the construction of ALTERNATE_ROOT_PATH for the other frameworks. + +* Configurations/WebGPU.xcconfig: + 2022-03-10 Michael Saboff Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (291183 => 291184) --- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-11 21:07:19 UTC (rev 291183) +++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-11 21:08:46 UTC (rev 291184) @@ -41,7 +41,7 @@ DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR); DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE); -ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE); +ALTERNATE_ROOT_PATH = $(WEBGPU_FRAMEWORKS_DIR); OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [291139] trunk/Source
Title: [291139] trunk/Source Revision 291139 Author msab...@apple.com Date 2022-03-10 17:20:55 -0800 (Thu, 10 Mar 2022) Log Message Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path https://bugs.webkit.org/show_bug.cgi?id=237748 Reviewed by Mark Lam. Updated the configuration to exclude copying Catalyst build products to the secondary path. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/libwebrtc.xcconfig: Source/WebCore: * Configurations/WebCore.xcconfig: Source/WebGPU: * Configurations/WebGPU.xcconfig: Source/WebInspectorUI: * Configurations/WebInspectorUIFramework.xcconfig: Source/WebKit: * Configurations/Base.xcconfig: Source/WebKitLegacy/mac: * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (291138 => 291139) --- trunk/Source/_javascript_Core/ChangeLog 2022-03-11 00:38:44 UTC (rev 291138) +++ trunk/Source/_javascript_Core/ChangeLog 2022-03-11 01:20:55 UTC (rev 291139) @@ -1,3 +1,14 @@ +2022-03-10 Michael Saboff + +Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path +https://bugs.webkit.org/show_bug.cgi?id=237748 + +Reviewed by Mark Lam. + +Updated the configuration to exclude copying Catalyst build products to the secondary path. + +* Configurations/Base.xcconfig: + 2022-03-10 Elliott Williams [XCBuild] Fix GeneratedSources dependency validation errors Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (291138 => 291139) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-03-11 00:38:44 UTC (rev 291138) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-03-11 01:20:55 UTC (rev 291139) @@ -34,8 +34,10 @@ INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH)); INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH); SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH) +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT)); +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH) ALWAYS_SEARCH_USER_PATHS = NO; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (291138 => 291139) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-11 00:38:44 UTC (rev 291138) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-11 01:20:55 UTC (rev 291139) @@ -1,3 +1,14 @@ +2022-03-10 Michael Saboff + +Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path +https://bugs.webkit.org/show_bug.cgi?id=237748 + +Reviewed by Mark Lam. + +Updated the configuration to exclude copying Catalyst build products to the secondary path. + +* Configurations/ANGLE-dynamic.xcconfig: + 2022-03-08 Kimmo Kinnunen ANGLE display cache does not work with explicit device ids Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (291138 => 291139) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-11 00:38:44 UTC (rev 291138) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-11 01:20:55 UTC (rev 291139) @@ -18,8 +18,10 @@ INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH); SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari STAGED_DYLIB_FRAMEWORK_PATH=/WebCore.framework/Versions/A/Frameworks -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO -COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH) +COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH =
[webkit-changes] [290960] trunk/Source/WebGPU
Title: [290960] trunk/Source/WebGPU
Revision 290960
Author msab...@apple.com
Date 2022-03-07 15:08:24 -0800 (Mon, 07 Mar 2022)
Log Message
Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
https://bugs.webkit.org/show_bug.cgi?id=237542
Reviewed by Saam Barati.
Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
exist in lieu of specifying an output file in the build step.
This is the way that other projects are configured.
* Scripts/create-symlink-to-altroot.sh:
* WebGPU.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh
trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebGPU/ChangeLog (290959 => 290960)
--- trunk/Source/WebGPU/ChangeLog 2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/ChangeLog 2022-03-07 23:08:24 UTC (rev 290960)
@@ -1,3 +1,17 @@
+2022-03-07 Michael Saboff
+
+Catalyst build failure in WebGPU when building with SYSTEM_CONTENT_PATH
+https://bugs.webkit.org/show_bug.cgi?id=237542
+
+Reviewed by Saam Barati.
+
+Updated create-symlink-to-altroot.sh to create the directory containing the output if is doesn't
+exist in lieu of specifying an output file in the build step.
+This is the way that other projects are configured.
+
+* Scripts/create-symlink-to-altroot.sh:
+* WebGPU.xcodeproj/project.pbxproj:
+
2022-03-06 Myles C. Maxfield
[WebGPU] Use C++ references instead of pointers where applicable
Modified: trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh (290959 => 290960)
--- trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh 2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh 2022-03-07 23:08:24 UTC (rev 290960)
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
set -e
@@ -14,6 +14,12 @@
RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${ALTERNATE_ROOT_PATH}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//")
SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_PATH}/${FULL_PRODUCT_NAME}"
+OUTPUT_ALTERNATE_ROOT_DIR=`dirname ${OUTPUT_ALTERNATE_ROOT_PATH}`
+
+if [[ ! -d ${OUTPUT_ALTERNATE_ROOT_DIR} ]]; then
+mkdir -p ${OUTPUT_ALTERNATE_ROOT_DIR}
+fi
+
if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
Modified: trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (290959 => 290960)
--- trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-03-07 23:07:55 UTC (rev 290959)
+++ trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-03-07 23:08:24 UTC (rev 290960)
@@ -561,7 +561,6 @@
outputFileListPaths = (
);
outputPaths = (
-"${OUTPUT_ALTERNATE_ROOT_PATH}",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/zsh;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [290805] trunk/Source
Title: [290805] trunk/Source Revision 290805 Author msab...@apple.com Date 2022-03-03 17:26:55 -0800 (Thu, 03 Mar 2022) Log Message Copy WebKit frameworks and XPC processes to Secondary Path https://bugs.webkit.org/show_bug.cgi?id=237394 Reviewed by Saam Barati. Source/_javascript_Core: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/Base.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: * Scripts/copy-frameworks-to-secondary-path.sh: Added. Source/ThirdParty/ANGLE: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE-dynamic.xcconfig: * scripts/copy-frameworks-to-secondary-path.sh: Added. Source/ThirdParty/libwebrtc: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/libwebrtc.xcconfig: * Scripts/copy-frameworks-to-secondary-path.sh: Added. * libwebrtc.xcodeproj/project.pbxproj: Source/WebCore: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/WebCore.xcconfig: * Scripts/copy-frameworks-to-secondary-path.sh: Added. * WebCore.xcodeproj/project.pbxproj: Source/WebGPU: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/WebGPU.xcconfig: * Scripts/copy-frameworks-to-secondary-path.sh: Added. * WebGPU.xcodeproj/project.pbxproj: Source/WebInspectorUI: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/WebInspectorUIFramework.xcconfig: * Scripts/copy-frameworks-to-secondary-path.sh: Added. * WebInspectorUI.xcodeproj/project.pbxproj: Source/WebKit: Added build configuration variables and scripts to copy the built Framework as well as the XPC services to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. When copying the XPC services, we update the XPC binaries to reference the frameworks from the SYSTEM_SECONDARY_CONTENT_PATH by updating DYLD_VERSIONED_FRAMEWORK_PATH. * Configurations/Base.xcconfig: * Configurations/WebKitSwift.xcconfig: * Scripts/copy-frameworks-to-secondary-path.sh: Added. * Scripts/copy-xpc-services-to-secondary-path.sh: Added. * Scripts/update-dyld-environment-load-command: Added. * Scripts/webkitpy: Added. * Scripts/webkitpy/mach_o.py: Added. (_utf8_bytes_to_str): (_mach_o_int_field): (_mach_o_int_field._get_mach_o_int_field): (_mach_o_int_field._set_mach_o_int_field): (_mach_o_int_field._set_mach_o_int_field.func): (_mach_o_chararray_field): (_mach_o_chararray_field._get_mach_o_chararray_field): (_mach_o_chararray_field._set_mach_o_chararray_field): (_mach_o_chararray_field._set_mach_o_chararray_field.func): (_mach_o_varchar_field): (_mach_o_varchar_field._get_mach_o_varchar_field): (_mach_o_varchar_field._set_mach_o_varchar_field): (_mach_o_varchar_field._set_mach_o_varchar_field.func): (MachOCommand): (MachOCommand.__init__): (MachOSourceVersionCommand): (MachOSourceVersionCommand.version_str): (MachOSection): (MachOSection.__init__): (MachOSegmentCommand): (MachOSection32): (MachOSegment32Command): (MachOSegment32Command.__init__): (MachOSection64): (MachOSegment64Command): (MachOSegment64Command.__init__): (MachOLoadDylibCommand): (MachOLoadDylibCommand._version_str): (MachOLoadDylibCommand.compatibility_version_str): (MachOLoadDylibCommand.current_version_str): (MachODyldEnvironmentCommand): (MachODyldEnvironmentCommand.variable): (MachODyldEnvironmentCommand.value): (MachODyldEnvironmentCommand.build): (MachOIDDylibCommand): (MachOHeader): (MachOHeader.__init__): (MachOHeader.used_header_size): (MachOHeader.total_header_size): (MachOHeader.available_header_size): (MachOHeader.architecture_name): (MachOHeader.id_command): (MachOHeader.dyld_env_commands): (MachOHeader.dyld_versioned_framework_paths): (MachOHeader.filter_commands): (MachOHeader.update_file): (MachOHeader.parse_command): (MachOHeader32LE): (MachOHeader32LE.__init__): (MachOHeader64LE): (MachOHeader64LE.__init__): (MachOFile): (MachOFile.__init__): (is_macho_bytes): (is_macho_file): (enumerate_macho_files): * WebKit.xcodeproj/project.pbxproj: Source/WebKitLegacy: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * WebKitLegacy.xcodeproj/project.pbxproj: * scripts/copy-frameworks-to-secondary-path.sh: Added. Source/WebKitLegacy/mac: Added build configuration variables and scripts to copy the built Framework to the SYSTEM_SECONDARY_CONTENT_PATH when it is set. * Configurations/Base.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog
[webkit-changes] [289091] trunk/Source
Title: [289091] trunk/Source Revision 289091 Author msab...@apple.com Date 2022-02-03 17:16:05 -0800 (Thu, 03 Feb 2022) Log Message WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path https://bugs.webkit.org/show_bug.cgi?id=236105 Reviewed by Saam Barati. Source/_javascript_Core: Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the system content path prefix. * Configurations/_javascript_Core.xcconfig: Source/ThirdParty/ANGLE: Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix. * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to not use the system content path prefix. * Configurations/libwebrtc.xcconfig: Source/WebCore: Added WK_USE_ALTERNATE_FRAMEWORKS_DIR based computation to the WEBCORE_FRAMEWORKS_DIR production. This allowed the simplification of NORMAL_PRODUCTION_FRAMEWORKS_DIR. Changed DYLIB_INSTALL_NAME_BASE_PLATFORM for Catalyst builds to use WEBCORE_FRAMEWORKS_DIR. * Configurations/WebCore.xcconfig: Source/WebKit: Refactored build variable computation so that WEBKIT_FRAMEWORKS_DIR doesn't have the system content path prepended. This refactoring includes: - Created INSTALL_PATH_PREFIX to have the system content path when in use. - Changed WEBKIT_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH. - Added INSTALL_PATH_PREFIX to the various INSTALL_PATH computations. - Changed the various DYLIB_INSTALL_NAME_BASE computations for Catalyst builds to use WEBKIT_FRAMEWORKS_DIR. * Configurations/Base.xcconfig: * Configurations/BaseTarget.xcconfig: * Configurations/BaseXPCService.xcconfig: * Configurations/Shim.xcconfig: * Configurations/WebKit.xcconfig: * Configurations/WebKitSwift.xcconfig: * Configurations/adattributiond.xcconfig: * Configurations/webpushd.xcconfig: Source/WebKitLegacy/mac: Refactored build variable computation so that WEBKIT_LEGACY_FRAMEWORKS_DIR doesn't have the system content path prepended. This refactoring includes: - Created INSTALL_PATH_PREFIX to have the system content path when in use. - Changed WEBKIT_LEGACY_FRAMEWORKS_DIR computation to eliminate the inclusion the SYSTEM_CONTENT_PATH. - Reworked INSTALL_PATH to use INSTALL_PATH_PREFIX in the main productions instead of each of variants. - Changed DYLIB_INSTALL_NAME_BASE computation for Catalyst builds to use WEBKIT_LEGACY_FRAMEWORKS_DIR. * Configurations/Base.xcconfig: * Configurations/WebKitLegacy.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/Base.xcconfig trunk/Source/WebKit/Configurations/BaseTarget.xcconfig trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig trunk/Source/WebKit/Configurations/Shim.xcconfig trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig trunk/Source/WebKit/Configurations/adattributiond.xcconfig trunk/Source/WebKit/Configurations/webpushd.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (289090 => 289091) --- trunk/Source/_javascript_Core/ChangeLog 2022-02-04 01:06:52 UTC (rev 289090) +++ trunk/Source/_javascript_Core/ChangeLog 2022-02-04 01:16:05 UTC (rev 289091) @@ -1,3 +1,15 @@ +2022-02-03 Michael Saboff + +WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path +https://bugs.webkit.org/show_bug.cgi?id=236105 + +Reviewed by Saam Barati. + +Updated DYLIB_INSTALL_NAME_BASE for Catalyst builds to use _javascript_CORE_FRAMEWORKS_DIR, which doesn't have the +system content path prefix. + +* Configurations/_javascript_Core.xcconfig: + 2022-02-03 Yusuke Suzuki [JSC] MultiDeleteByOffset should not define value Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (289090 => 289091) --- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-02-04 01:06:52 UTC (rev 289090) +++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-02-04 01:16:05 UTC (rev 289091) @@ -46,7 +46,7 @@ INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR); DYLIB_INSTALL_NAME_BASE =
[webkit-changes] [288917] trunk/Source/WebKit
Title: [288917] trunk/Source/WebKit Revision 288917 Author msab...@apple.com Date 2022-02-01 15:53:14 -0800 (Tue, 01 Feb 2022) Log Message Catalyst builds of WebKit with system content path put XPCServices and Daemons in the normal location https://bugs.webkit.org/show_bug.cgi?id=235976 Reviewed by Mark Lam. The production of WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES used the system framework path instead of using the computed value of NORMAL_WEBKIT_FRAMEWORKS_DIR which includes the Catalyst prefix. * Configurations/BaseTarget.xcconfig: Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/BaseTarget.xcconfig Diff Modified: trunk/Source/WebKit/ChangeLog (288916 => 288917) --- trunk/Source/WebKit/ChangeLog 2022-02-01 23:24:29 UTC (rev 288916) +++ trunk/Source/WebKit/ChangeLog 2022-02-01 23:53:14 UTC (rev 288917) @@ -1,3 +1,15 @@ +2022-02-01 Michael Saboff + +Catalyst builds of WebKit with system content path put XPCServices and Daemons in the normal location +https://bugs.webkit.org/show_bug.cgi?id=235976 + +Reviewed by Mark Lam. + +The production of WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES used the system framework path +instead of using the computed value of NORMAL_WEBKIT_FRAMEWORKS_DIR which includes the Catalyst prefix. + +* Configurations/BaseTarget.xcconfig: + 2022-02-01 Per Arne Vollan [macOS][WP] Add required syscall Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (288916 => 288917) --- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-01 23:24:29 UTC (rev 288916) +++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-02-01 23:53:14 UTC (rev 288917) @@ -67,7 +67,7 @@ NORMAL_WEBKIT_FRAMEWORKS_DIR = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks; WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); -WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks; +WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBKIT_FRAMEWORKS_DIR); WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO); WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288766] trunk/Source
Title: [288766] trunk/Source Revision 288766 Author msab...@apple.com Date 2022-01-28 16:36:24 -0800 (Fri, 28 Jan 2022) Log Message Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path https://bugs.webkit.org/show_bug.cgi?id=235839 Reviewed by Saam Barati. Source/WebCore: Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds since they are under WebKit.framework. * Configurations/WebCore.xcconfig: Source/WebKitLegacy/mac: Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds, but not for normal macOS builds since they are under WebKit.framework. * Configurations/WebKitLegacy.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (288765 => 288766) --- trunk/Source/WebCore/ChangeLog 2022-01-29 00:25:23 UTC (rev 288765) +++ trunk/Source/WebCore/ChangeLog 2022-01-29 00:36:24 UTC (rev 288766) @@ -1,3 +1,15 @@ +2022-01-28 Michael Saboff + +Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path +https://bugs.webkit.org/show_bug.cgi?id=235839 + +Reviewed by Saam Barati. + +Fixed ALTERNATE_ROOT_PATH to have a proper path for Catalyst builds, but not for normal macOS builds +since they are under WebKit.framework. + +* Configurations/WebCore.xcconfig: + 2022-01-28 Alexey Shvayka Remove showModalDialog-specific logic from JSDOMWindow::getOwnPropertySlot() Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (288765 => 288766) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-29 00:25:23 UTC (rev 288765) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-29 00:36:24 UTC (rev 288766) @@ -75,6 +75,8 @@ UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp; ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +ALTERNATE_ROOT_PATH[sdk=macosx*] = $(ALTERNATE_ROOT_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +ALTERNATE_ROOT_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (288765 => 288766) --- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-29 00:25:23 UTC (rev 288765) +++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-01-29 00:36:24 UTC (rev 288766) @@ -1,3 +1,15 @@ +2022-01-28 Michael Saboff + +Catalyst builds for WebCore and WebKitLegacy don't create proper symlinks for builds with system content path +https://bugs.webkit.org/show_bug.cgi?id=235839 + +Reviewed by Saam Barati. + +Fixed ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH to have proper paths for Catalyst builds, +but not for normal macOS builds since they are under WebKit.framework. + +* Configurations/WebKitLegacy.xcconfig: + 2022-01-27 Devin Rousso [Payment Request] allow additional payment method specific data to be passed to `complete()` Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (288765 => 288766) --- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-29 00:25:23 UTC (rev 288765) +++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-01-29 00:36:24 UTC (rev 288766) @@ -79,10 +79,15 @@ APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM); ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +ALTERNATE_ROOT_PATH[sdk=macosx*] = $(ALTERNATE_ROOT_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +ALTERNATE_ROOT_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); +OUTPUT_ALTERNATE_ROOT_PATH[sdk=macosx*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +OUTPUT_ALTERNATE_ROOT_PATH_YES_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); + PRODUCT_NAME = WebKitLegacy; PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier); UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [288749] trunk/Source
Title: [288749] trunk/Source Revision 288749 Author msab...@apple.com Date 2022-01-28 11:03:47 -0800 (Fri, 28 Jan 2022) Log Message Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path https://bugs.webkit.org/show_bug.cgi?id=235821 Reviewed by Saam Barati. Source/WebCore: The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix after the Catalyst prefix. I reversed them. * Configurations/WebCore.xcconfig: Source/WebKit: Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location. Changed the create symlink script to create the directory path leading up to the symlink because it isn't created for Catalyst builds. * Configurations/SDKVariant.xcconfig: * Configurations/WebKit.xcconfig: * Scripts/create-symlink-to-altroot.sh: * WebKit.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Diff Modified: trunk/Source/WebCore/ChangeLog (288748 => 288749) --- trunk/Source/WebCore/ChangeLog 2022-01-28 19:01:21 UTC (rev 288748) +++ trunk/Source/WebCore/ChangeLog 2022-01-28 19:03:47 UTC (rev 288749) @@ -1,3 +1,15 @@ +2022-01-28 Michael Saboff + +Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path +https://bugs.webkit.org/show_bug.cgi?id=235821 + +Reviewed by Saam Barati. + +The value of _javascript_CORE_PRIVATE_HEADERS_DIR for Catalyst builds had the system content prefix +after the Catalyst prefix. I reversed them. + +* Configurations/WebCore.xcconfig: + 2022-01-28 Carlos Garcia Campos [GTK][a11y] WTR: implement AccessibilityUIElement::isIgnored() for ATSPI Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (288748 => 288749) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-28 19:01:21 UTC (rev 288748) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-28 19:03:47 UTC (rev 288749) @@ -184,7 +184,7 @@ _javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering); _javascript_CORE_PRIVATE_HEADERS_DIR_Debug = $(_javascript_CORE_PRIVATE_HEADERS_engineering); _javascript_CORE_PRIVATE_HEADERS_DIR_Production = $(_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)); -_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders; +_javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders; _javascript_CORE_PRIVATE_HEADERS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders; _javascript_CORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/_javascript_Core.framework/$(WK_FRAMEWORK_VERSION_PREFIX)PrivateHeaders; Modified: trunk/Source/WebKit/ChangeLog (288748 => 288749) --- trunk/Source/WebKit/ChangeLog 2022-01-28 19:01:21 UTC (rev 288748) +++ trunk/Source/WebKit/ChangeLog 2022-01-28 19:03:47 UTC (rev 288749) @@ -1,3 +1,19 @@ +2022-01-28 Michael Saboff + +Catalyst builds fail for WebCore, WebKi and WebKitLegacy for builds with system content path +https://bugs.webkit.org/show_bug.cgi?id=235821 + +Reviewed by Saam Barati. + +Eliminated the system content prefix from ALTERNATE_ROOT_PATH since it is the old location. +Changed the create symlink script to create the directory path leading up to the symlink because +it isn't created for Catalyst builds. + +* Configurations/SDKVariant.xcconfig: +* Configurations/WebKit.xcconfig: +* Scripts/create-symlink-to-altroot.sh: +* WebKit.xcodeproj/project.pbxproj: + 2022-01-28 Chris Dumez Symbols not always properly hidden when using WebKitAdditions to introduce new API Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (288748 => 288749) --- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-28 19:01:21 UTC (rev 288748) +++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-28 19:03:47 UTC (rev 288749) @@ -42,7 +42,7 @@ DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR); DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE); -ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE); +ALTERNATE_ROOT_PATH = $(NORMAL_WEBKIT_FRAMEWORKS_DIR); OUTPUT_ALTERNATE_ROOT_PATH =
[webkit-changes] [288710] trunk/Source
Title: [288710] trunk/Source Revision 288710 Author msab...@apple.com Date 2022-01-27 16:24:20 -0800 (Thu, 27 Jan 2022) Log Message com.apple.WebKit.WebAuthn.xpc fails to build with system content path https://bugs.webkit.org/show_bug.cgi?id=235734 Reviewed by Filip Pizlo. Source/_javascript_Core: Adjusted build path variables to handle the case when building for Catalyst. Did this by refactoring how the optional system content path is added as a prefix to paths. As a result, modified the create symlink script to not be dependent on the target location, since it isn't created when doing a catalyst build. Instead the script creates the parent directory of the symlink if it doesn't exisst. * Configurations/Base.xcconfig: * Configurations/JSC.xcconfig: * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: * Scripts/create-symlink-to-altroot.sh: Source/ThirdParty/libwebrtc: Added explicit PUBLIC_HEADERS_FOLDER_PATH vavriable. Otherwise we get the project version with didn't include the "libwebrtc" component. * Configurations/libwebrtc.xcconfig: Source/WebCore: Since WebCore is installed under the WebKit framework on macOS, we don't need a symlink for the WebCore.framework itself. As a result, modified the create symlink script to not be dependent on the target location, since it isn't created when doing a catalyst build. Instead the script creates the parent directory of the symlink if it doesn't exisst. * Configurations/WebCore.xcconfig: * Scripts/create-symlink-to-altroot.sh: * WebCore.xcodeproj/project.pbxproj: Source/WebKit: Since we symlink the the whole framework when building the main "WebKit" target, we can eliminate the create symlink script for the WebAuth target. Eliminated the setting of ALTERNATE_ROOT_PATH build variables for all XPC services. * Configurations/BaseXPCService.xcconfig: * WebKit.xcodeproj/project.pbxproj: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/_javascript_Core/Configurations/JSC.xcconfig trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Diff Modified: trunk/Source/_javascript_Core/ChangeLog (288709 => 288710) --- trunk/Source/_javascript_Core/ChangeLog 2022-01-28 00:01:39 UTC (rev 288709) +++ trunk/Source/_javascript_Core/ChangeLog 2022-01-28 00:24:20 UTC (rev 288710) @@ -1,3 +1,22 @@ +2022-01-27 Michael Saboff + +com.apple.WebKit.WebAuthn.xpc fails to build with system content path +https://bugs.webkit.org/show_bug.cgi?id=235734 + +Reviewed by Filip Pizlo. + +Adjusted build path variables to handle the case when building for Catalyst. +Did this by refactoring how the optional system content path is added as a prefix to paths. +As a result, modified the create symlink script to not be dependent on the target location, +since it isn't created when doing a catalyst build. Instead the script creates the parent +directory of the symlink if it doesn't exisst. + +* Configurations/Base.xcconfig: +* Configurations/JSC.xcconfig: +* Configurations/_javascript_Core.xcconfig: +* _javascript_Core.xcodeproj/project.pbxproj: +* Scripts/create-symlink-to-altroot.sh: + 2022-01-27 Gavin Phillips Check the process has the dynamic-codesigning entitlement before trying to allocate a holding JIT region Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (288709 => 288710) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-01-28 00:01:39 UTC (rev 288709) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2022-01-28 00:24:20 UTC (rev 288710) @@ -31,6 +31,9 @@ USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK); USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK); +INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH)); +INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH); + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = c++2a; @@ -163,8 +166,6 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
[webkit-changes] [288629] trunk/Source/WebKit
Title: [288629] trunk/Source/WebKit
Revision 288629
Author msab...@apple.com
Date 2022-01-26 10:55:20 -0800 (Wed, 26 Jan 2022)
Log Message
Build failure - webkit daemons don't need symlink with system content path
https://bugs.webkit.org/show_bug.cgi?id=235648
Reviewed by Darin Adler.
Removed the create symlinks for the WebKit daemons since they are under the symlink for
/System/Library/WebKit.framework.
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/adattributiond.xcconfig
trunk/Source/WebKit/Configurations/webpushd.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit/ChangeLog (288628 => 288629)
--- trunk/Source/WebKit/ChangeLog 2022-01-26 18:04:26 UTC (rev 288628)
+++ trunk/Source/WebKit/ChangeLog 2022-01-26 18:55:20 UTC (rev 288629)
@@ -1,3 +1,17 @@
+2022-01-26 Michael Saboff
+
+Build failure - webkit daemons don't need symlink with system content path
+https://bugs.webkit.org/show_bug.cgi?id=235648
+
+Reviewed by Darin Adler.
+
+Removed the create symlinks for the WebKit daemons since they are under the symlink for
+/System/Library/WebKit.framework.
+
+* Configurations/adattributiond.xcconfig:
+* Configurations/webpushd.xcconfig:
+* WebKit.xcodeproj/project.pbxproj:
+
2022-01-26 Antoine Quint
[Model] Mouse interaction for is flipped in the y-axis
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (288628 => 288629)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 18:04:26 UTC (rev 288628)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 18:55:20 UTC (rev 288629)
@@ -36,8 +36,3 @@
INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
-
-ALTERNATE_ROOT_PATH = $(INSTALL_PATH);
-
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
Modified: trunk/Source/WebKit/Configurations/webpushd.xcconfig (288628 => 288629)
--- trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 18:04:26 UTC (rev 288628)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig 2022-01-26 18:55:20 UTC (rev 288629)
@@ -44,10 +44,4 @@
INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
-ALTERNATE_ROOT_PATH = $(INSTALL_PATH);
-
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
-
SKIP_INSTALL = $(WK_SKIP_INSTALL_WEBPUSHD)
-
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288628 => 288629)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 18:04:26 UTC (rev 288628)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-26 18:55:20 UTC (rev 288629)
@@ -14121,7 +14121,6 @@
buildPhases = (
517B5F57275A8D3E002DC22D /* Sources */,
517B5F58275A8D3E002DC22D /* Frameworks */,
-6577FFC32769C8110011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14164,7 +14163,6 @@
5C1579D227165B2F00ED5280 /* Sources */,
5C1579D427165B2F00ED5280 /* Frameworks */,
5C1579D527165B2F00ED5280 /* Process webpushd Entitlements */,
-6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -14185,7 +14183,6 @@
5CAF7A9D26F93A750003F19E /* Sources */,
5CAF7A9F26F93A750003F19E /* Frameworks */,
5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */,
-6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
);
@@ -15075,60 +15072,6 @@
shellPath = /bin/zsh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
- 6577FFC12769C7BB0011AEC8 /* Create Symlink to Alt Root Path */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- name = "Create Symlink to Alt Root Path";
- outputFileListPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/zsh;
- shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
- };
- 6577FFC22769C7EE0011AEC8 /* Create Symlink to Alt Root Path */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- name = "Create Symlink to Alt Root Path";
- outputFileListPaths = (
- );
-
[webkit-changes] [288593] trunk/Source
Title: [288593] trunk/Source
Revision 288593
Author msab...@apple.com
Date 2022-01-25 17:11:36 -0800 (Tue, 25 Jan 2022)
Log Message
Install build failure when using SYSTEM_CONTENT_PATH
https://bugs.webkit.org/show_bug.cgi?id=235609
Reviewed by Filip Pizlo.
Source/ThirdParty/libwebrtc:
Change the Create Symlinks to Alternate Root script to create the links for the headers
for both the install headers and install phases.
* Scripts/create-symlink-to-altroot.sh:
Source/WebKit:
Eliminated the Output Files of the Create Symlink to Alt Root Path script for the targets
adattributiond, GPU, Networking, WebAuthn, webpushd, and the various WebContent targets,
since the symlink to WebKit.framework will be created by the "WebKit" target.
Also fixed the INSTALL_PATH for adattributiond and webpushd to follow the difference between
macOS and iOS.
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/adattributiond.xcconfig
trunk/Source/WebKit/Configurations/webpushd.xcconfig
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (288592 => 288593)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-26 01:11:36 UTC (rev 288593)
@@ -1,3 +1,15 @@
+2022-01-25 Michael Saboff
+
+Install build failure when using SYSTEM_CONTENT_PATH
+https://bugs.webkit.org/show_bug.cgi?id=235609
+
+Reviewed by Filip Pizlo.
+
+Change the Create Symlinks to Alternate Root script to create the links for the headers
+for both the install headers and install phases.
+
+* Scripts/create-symlink-to-altroot.sh:
+
2022-01-24 Youenn Fablet
Cherry-pick WebRTC 235826 change
Modified: trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh (288592 => 288593)
--- trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh 2022-01-26 01:11:36 UTC (rev 288593)
@@ -2,18 +2,14 @@
set -e
-if [[ "${ACTION}" == "installhdrs" && ( -z "${SYSTEM_PUBLIC_HEADER_PREFIX}" || -z "${HEADER_FOLDER_LIST}" ) ]]; then
+if [[ "${SKIP_INSTALL}" == "YES" ]]; then
exit 0
fi
-if [[ "${ACTION}" == "install" && ( -z "${SYSTEM_PUBLIC_LIBRARY_PREFIX}" || -z "${LIBRARY_LIST}" ) ]]; then
+if [[ -z "${SYSTEM_PUBLIC_HEADER_PREFIX}" || -z "${HEADER_FOLDER_LIST}" || -z "${SYSTEM_PUBLIC_LIBRARY_PREFIX}" || -z "${LIBRARY_LIST}" ]]; then
exit 0
fi
-if [[ "${SKIP_INSTALL}" == "YES" ]]; then
-exit 0
-fi
-
create_symlink_if_needed()
{
INSTALL_FOLDER_PREFIX=$1
@@ -43,7 +39,7 @@
ln -sf "${SYMLINK_VALUE}" "${SYSTEM_HEADER_PATH}"
}
-if [[ "${ACTION}" == "installhdrs" ]]
+if [[ "${ACTION}" == "installhdrs" || "${ACTION}" == "install" ]]
then
if [[ ! -d ${SYSTEM_PUBLIC_HEADER_PREFIX} ]]; then
mkdir -p ${SYSTEM_PUBLIC_HEADER_PREFIX}
Modified: trunk/Source/WebKit/ChangeLog (288592 => 288593)
--- trunk/Source/WebKit/ChangeLog 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/ChangeLog 2022-01-26 01:11:36 UTC (rev 288593)
@@ -1,3 +1,20 @@
+2022-01-25 Michael Saboff
+
+Install build failure when using SYSTEM_CONTENT_PATH
+https://bugs.webkit.org/show_bug.cgi?id=235609
+
+Reviewed by Filip Pizlo.
+
+Eliminated the Output Files of the Create Symlink to Alt Root Path script for the targets
+adattributiond, GPU, Networking, WebAuthn, webpushd, and the various WebContent targets,
+since the symlink to WebKit.framework will be created by the "WebKit" target.
+Also fixed the INSTALL_PATH for adattributiond and webpushd to follow the difference between
+macOS and iOS.
+
+* Configurations/adattributiond.xcconfig:
+* Configurations/webpushd.xcconfig:
+* WebKit.xcodeproj/project.pbxproj:
+
2022-01-25 Per Arne Vollan
[macOS][WP] Allow mach extension to service
Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (288592 => 288593)
--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:10:59 UTC (rev 288592)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig 2022-01-26 01:11:36 UTC (rev 288593)
@@ -37,7 +37,7 @@
INSTALL_PATH[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Daemons;
-ALTERNATE_ROOT_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Daemons;
+ALTERNATE_ROOT_PATH = $(INSTALL_PATH);
OUTPUT_ALTERNATE_ROOT_PATH =
[webkit-changes] [288391] trunk/Source/ThirdParty/libwebrtc
Title: [288391] trunk/Source/ThirdParty/libwebrtc Revision 288391 Author msab...@apple.com Date 2022-01-21 17:38:42 -0800 (Fri, 21 Jan 2022) Log Message WebKit fails to build - error: 'webrtc/rtc_base/network.h' file not found https://bugs.webkit.org/show_bug.cgi?id=235459 Reviewed by Mark Lam. We needed to create symlinks from the standard location to the SYSTEM_CONTENT_PATH location. This is needed for both the include files and archive libraries. * Configurations/boringssl.xcconfig: * Configurations/libsrtp.xcconfig: * Configurations/libvpx.xcconfig: * Configurations/libwebm.xcconfig: * Configurations/libwebrtc.xcconfig: * Configurations/libyuv.xcconfig: * Configurations/opus.xcconfig: * Configurations/usrsctp.xcconfig: * Scripts: Added. * Scripts/create-symlink-to-altroot.sh: Added. * libwebrtc.xcodeproj/project.pbxproj: Modified Paths trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj Added Paths trunk/Source/ThirdParty/libwebrtc/Scripts/ trunk/Source/ThirdParty/libwebrtc/Scripts/create-symlink-to-altroot.sh Diff Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (288390 => 288391) --- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-22 01:23:48 UTC (rev 288390) +++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-22 01:38:42 UTC (rev 288391) @@ -1,3 +1,25 @@ +2022-01-21 Michael Saboff + +WebKit fails to build - error: 'webrtc/rtc_base/network.h' file not found +https://bugs.webkit.org/show_bug.cgi?id=235459 + +Reviewed by Mark Lam. + +We needed to create symlinks from the standard location to the SYSTEM_CONTENT_PATH location. +This is needed for both the include files and archive libraries. + +* Configurations/boringssl.xcconfig: +* Configurations/libsrtp.xcconfig: +* Configurations/libvpx.xcconfig: +* Configurations/libwebm.xcconfig: +* Configurations/libwebrtc.xcconfig: +* Configurations/libyuv.xcconfig: +* Configurations/opus.xcconfig: +* Configurations/usrsctp.xcconfig: +* Scripts: Added. +* Scripts/create-symlink-to-altroot.sh: Added. +* libwebrtc.xcodeproj/project.pbxproj: + 2022-01-19 Youenn Fablet libvpx firstpass.c is not needed Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig (288390 => 288391) --- trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig 2022-01-22 01:23:48 UTC (rev 288390) +++ trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig 2022-01-22 01:38:42 UTC (rev 288391) @@ -6,9 +6,13 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = NO; COMBINE_HIDPI_IMAGES = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + +INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); +INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH); + HEADER_SEARCH_PATHS = Source/third_party/boringssl/src/include; -INSTALL_PATH = /usr/local/lib; -PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc; +INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib; +PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc; USE_HEADERMAP = NO; GCC_WARN_UNUSED_FUNCTION = NO; Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig (288390 => 288391) --- trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig 2022-01-22 01:23:48 UTC (rev 288390) +++ trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig 2022-01-22 01:38:42 UTC (rev 288391) @@ -7,8 +7,11 @@ COMBINE_HIDPI_IMAGES = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; +INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); +INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH); + HEADER_SEARCH_PATHS = Source/third_party/libsrtp/include Source/third_party/libsrtp/config Source/third_party/boringssl/src/include Source/third_party/libsrtp Source/third_party/libsrtp/crypto/include; -INSTALL_PATH = /usr/local/lib; -PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc; +INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib; +PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc; USE_HEADERMAP = NO; GCC_PREPROCESSOR_DEFINITIONS = V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1
[webkit-changes] [287884] trunk/Source
Title: [287884] trunk/Source Revision 287884 Author msab...@apple.com Date 2022-01-11 09:55:07 -0800 (Tue, 11 Jan 2022) Log Message Fixed installhdr build failures in WebCore and WebKitLegacy https://bugs.webkit.org/show_bug.cgi?id=235059 Reviewed by Filip Pizlo. Source/WebCore: Reworked how SYSTEM_CONTENT_PATH is added to values to the minimum that is required for the build system. Before this change, SYSTEM_CONTENT_PATH was added twice to some configuration variables due to is incorrectly being added to NORMAL_WEBCORE_FRAMEWORKS_DIR. Also refactored the computation of _javascript_CORE_PRIVATE_HEADERS_DIR to use the newly added INSTALL_PATH_PREFIX value. * Configurations/WebCore.xcconfig: Source/WebKitLegacy: On iOS, we need to create symbolic links for WebKitLegacy when using the SYSTEM_CONTENT_PATH. Copied the creation script to the project and updated the configuration file accordingly. * WebKitLegacy.xcodeproj/project.pbxproj: * scripts/create-symlink-to-altroot.sh: Added. Source/WebKitLegacy/mac: Refactored how INSTALL_PATH is calculated to simplify the logic for the macOS / iOS location difference for the WebKitLegacy framework. In WebKitLegacy.xcconfig, that required changing NORMAL_PRODUCTION_FRAMEWORKS_DIR. Added the configuration values, ALTERNATE_ROOT_PATH and OUTPUT_ALTERNATE_ROOT_PATH, for iOS builds to drive the newly added create symlinks script. Did the same rework as in WebCore configuration to eliminate using SYSTEM_CONTENT_PATH twice for some paths. * Configurations/WebKitLegacy.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebKitLegacy/ChangeLog trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig Added Paths trunk/Source/WebKitLegacy/scripts/create-symlink-to-altroot.sh Diff Modified: trunk/Source/WebCore/ChangeLog (287883 => 287884) --- trunk/Source/WebCore/ChangeLog 2022-01-11 17:50:05 UTC (rev 287883) +++ trunk/Source/WebCore/ChangeLog 2022-01-11 17:55:07 UTC (rev 287884) @@ -1,3 +1,19 @@ +2022-01-11 Michael Saboff + +Fixed installhdr build failures in WebCore and WebKitLegacy +https://bugs.webkit.org/show_bug.cgi?id=235059 + +Reviewed by Filip Pizlo. + +Reworked how SYSTEM_CONTENT_PATH is added to values to the minimum that is required for the build system. +Before this change, SYSTEM_CONTENT_PATH was added twice to some configuration variables due to is +incorrectly being added to NORMAL_WEBCORE_FRAMEWORKS_DIR. + +Also refactored the computation of _javascript_CORE_PRIVATE_HEADERS_DIR to use the newly added +INSTALL_PATH_PREFIX value. + +* Configurations/WebCore.xcconfig: + 2022-01-11 Antoine Quint css/css-transitions/KeyframeEffect-setKeyframes.tentative.html is a failure Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (287883 => 287884) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-11 17:50:05 UTC (rev 287883) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-01-11 17:55:07 UTC (rev 287884) @@ -56,7 +56,10 @@ HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT); INFOPLIST_FILE = Info.plist; -INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH)); +INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); +INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH); + +INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_$(WK_COCOA_TOUCH)); INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR); @@ -72,7 +75,7 @@ UNEXPORTED_SYMBOLS_FILE = Configurations/WebCore.unexp; ALTERNATE_ROOT_PATH[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; -ALTERNATE_ROOT_PATH[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +ALTERNATE_ROOT_PATH[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); @@ -150,12 +153,9 @@ SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order; SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,WebCore.order; -NORMAL_WEBCORE_FRAMEWORKS_PREFIX = $(NORMAL_WEBCORE_FRAMEWORKS_PREFIX_$(USE_SYSTEM_CONTENT_PATH)); -NORMAL_WEBCORE_FRAMEWORKS_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
[webkit-changes] [287642] trunk/Source/ThirdParty
Title: [287642] trunk/Source/ThirdParty Revision 287642 Author msab...@apple.com Date 2022-01-05 11:42:45 -0800 (Wed, 05 Jan 2022) Log Message REGRESSION (r287382): libANGLE is built into a wrong location on iOS https://bugs.webkit.org/show_bug.cgi?id=234857 Reviewed by Saam Barati. Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix for the alternate root framework location. Source/ThirdParty/ANGLE: * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/libwebrtc.xcconfig: Modified Paths trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig Diff Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287641 => 287642) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-01-05 19:29:43 UTC (rev 287641) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-01-05 19:42:45 UTC (rev 287642) @@ -1,3 +1,15 @@ +2022-01-05 Michael Saboff + +REGRESSION (r287382): libANGLE is built into a wrong location on iOS +https://bugs.webkit.org/show_bug.cgi?id=234857 + +Reviewed by Saam Barati. + +Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix +for the alternate root framework location. + +* Configurations/ANGLE-dynamic.xcconfig: + 2021-12-22 Michael Saboff Fix WebKit Build issues when using system content path Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287641 => 287642) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-01-05 19:29:43 UTC (rev 287641) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-01-05 19:42:45 UTC (rev 287642) @@ -14,15 +14,15 @@ ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz; ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz; -INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); -INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; -INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO); -INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; -INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); +INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH); + +INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; +INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); -INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; +INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks; INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); -INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; +INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(INSTALL_PATH_PREFIX)$(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks; DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_$(WK_RELOCATABLE_FRAMEWORKS)); Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (287641 => 287642) --- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-05 19:29:43 UTC (rev 287641) +++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-01-05 19:42:45 UTC (rev 287642) @@ -1,3 +1,15 @@ +2022-01-05 Michael Saboff + +REGRESSION (r287382): libANGLE is built into a wrong location on iOS +https://bugs.webkit.org/show_bug.cgi?id=234857 + +Reviewed by Saam Barati. + +Reverted to the prior logic to compute INSTALL_PATH. Then added an optional prefix +for the alternate root framework location. + +* Configurations/libwebrtc.xcconfig: + 2021-12-22 Michael Saboff Fix WebKit Build issues when using system content path Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (287641 => 287642) --- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-01-05 19:29:43 UTC
[webkit-changes] [287382] trunk/Source
Title: [287382] trunk/Source
Revision 287382
Author msab...@apple.com
Date 2021-12-22 19:10:16 -0800 (Wed, 22 Dec 2021)
Log Message
Fix WebKit Build issues when using system content path
https://bugs.webkit.org/show_bug.cgi?id=234624
Reviewed by Filip Pizlo.
Source/ThirdParty/ANGLE:
Changed INSTALL_PATH on macOS builds to use a fully qualified .../WebCore.framework/Versions/A/Frameworks.
Deleted unused create-symlink-to-altroot.sh script.
* Configurations/ANGLE-dynamic.xcconfig:
* scripts/create-symlink-to-altroot.sh: Removed.
Source/ThirdParty/libwebrtc:
Changed INSTALL_PATH on macOS builds to use fully qualified .../WebCore.framework/Versions/A/Frameworks.
* Configurations/libwebrtc.xcconfig:
Source/WebCore:
Covered by existing tests.
Added SYSTEM_CONTENT_PATH processing to WebCore's normal location.
* Configurations/WebCore.xcconfig:
Source/WebKit:
Added SYSTEM_CONTENT_PATH processing to the nested frameworks path (UMBRELLA_FRAMEWORKS_DIR).
* Configurations/BaseTarget.xcconfig:
* Configurations/WebKit.xcconfig:
Source/WebKitLegacy/mac:
Added SYSTEM_CONTENT_PATH processing to NORMAL_PRODUCTION_FRAMEWORKS_DIR.
* Configurations/WebKitLegacy.xcconfig:
Modified Paths
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/ThirdParty/libwebrtc/ChangeLog
trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/WebCore.xcconfig
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
trunk/Source/WebKit/Configurations/WebKit.xcconfig
trunk/Source/WebKitLegacy/mac/ChangeLog
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
Removed Paths
trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287381 => 287382)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 02:19:55 UTC (rev 287381)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-23 03:10:16 UTC (rev 287382)
@@ -1,3 +1,16 @@
+2021-12-22 Michael Saboff
+
+Fix WebKit Build issues when using system content path
+https://bugs.webkit.org/show_bug.cgi?id=234624
+
+Reviewed by Filip Pizlo.
+
+Changed INSTALL_PATH on macOS builds to use a fully qualified .../WebCore.framework/Versions/A/Frameworks.
+Deleted unused create-symlink-to-altroot.sh script.
+
+* Configurations/ANGLE-dynamic.xcconfig:
+* scripts/create-symlink-to-altroot.sh: Removed.
+
2021-12-21 Michael Saboff
Fix symlinks for alternate root framework locations
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287381 => 287382)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 02:19:55 UTC (rev 287381)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-23 03:10:16 UTC (rev 287382)
@@ -15,9 +15,9 @@
ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
Deleted: trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh (287381 => 287382)
--- trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh 2021-12-23 02:19:55 UTC (rev 287381)
+++ trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh 2021-12-23 03:10:16 UTC (rev 287382)
@@ -1,30 +0,0 @@
-#!/bin/zsh
-
-set -e
-
-if [[ -z "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
-exit 0
-fi
-
-if [[ "${SKIP_INSTALL}" = "YES" ]]; then
-exit 0
-fi
-
-# Convert eg. `/System/Library/PrivateFrameworks` to `../../..`
-RELATIVE_PATH_FROM_SYMLINK_TO_ROOT=$(echo "${ALTERNATE_ROOT_PATH}" | sed -E -e "s/\/[a-zA-Z0-9_]+/..\//g" -e "s/\/$//")
-SYMLINK_VALUE="${RELATIVE_PATH_FROM_SYMLINK_TO_ROOT}${INSTALL_PATH}/${FULL_PRODUCT_NAME}"
-
-if [[ -L "${OUTPUT_ALTERNATE_ROOT_PATH}" ]]; then
-EXISTING_SYMLINK_VALUE=$(readlink "${OUTPUT_ALTERNATE_ROOT_PATH}")
-
[webkit-changes] [287361] trunk/Source/WebCore
Title: [287361] trunk/Source/WebCore Revision 287361 Author msab...@apple.com Date 2021-12-22 10:24:04 -0800 (Wed, 22 Dec 2021) Log Message Fix WebCore install headers with alternate build https://bugs.webkit.org/show_bug.cgi?id=234592 Reviewed by Filip Pizlo. Covered by existing tests. Fixed OUTPUT_ALTERNATE_ROOT_PATH for macOS to return an empty value since we don't need a symlink as the WebCore framework is in a subdirectory of WebKit.framework. Fixed typos with NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES rules, eliminating the ')'s at the end of the lines. * Configurations/WebCore.xcconfig: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig Diff Modified: trunk/Source/WebCore/ChangeLog (287360 => 287361) --- trunk/Source/WebCore/ChangeLog 2021-12-22 17:59:28 UTC (rev 287360) +++ trunk/Source/WebCore/ChangeLog 2021-12-22 18:24:04 UTC (rev 287361) @@ -1,3 +1,19 @@ +2021-12-22 Michael Saboff + +Fix WebCore install headers with alternate build +https://bugs.webkit.org/show_bug.cgi?id=234592 + +Reviewed by Filip Pizlo. + +Covered by existing tests. + +Fixed OUTPUT_ALTERNATE_ROOT_PATH for macOS to return an empty value since we don't need a symlink +as the WebCore framework is in a subdirectory of WebKit.framework. +Fixed typos with NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES rules, +eliminating the ')'s at the end of the lines. + +* Configurations/WebCore.xcconfig: + 2021-12-22 Tim Nguyen Internally unprefix -webkit-text-emphasis properties Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (287360 => 287361) --- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-22 17:59:28 UTC (rev 287360) +++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-12-22 18:24:04 UTC (rev 287361) @@ -75,10 +75,11 @@ ALTERNATE_ROOT_PATH[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); OUTPUT_ALTERNATE_ROOT_PATH[sdk=iphone*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); -OUTPUT_ALTERNATE_ROOT_PATH[sdk=macosx*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)); OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=iphone*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); -OUTPUT_ALTERNATE_ROOT_PATH_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); +OUTPUT_ALTERNATE_ROOT_PATH[sdk=macosx*] = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH)_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +OUTPUT_ALTERNATE_ROOT_PATH_YES_YES[sdk=macosx*] = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME); + WK_ANGLE_LDFLAGS = -weak-lANGLE-shared; WK_WEBGPU_LDFLAGS = ; // To be filled-in after Apple update its internal build system. @@ -157,8 +158,8 @@ WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR); NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); -NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=iphone*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks); -NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=macosx*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks); +NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=iphone*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; +NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=macosx*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks; NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO); NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [287326] trunk/Source
Title: [287326] trunk/Source
Revision 287326
Author msab...@apple.com
Date 2021-12-21 12:16:05 -0800 (Tue, 21 Dec 2021)
Log Message
Fix symlinks for alternate root framework locations
https://bugs.webkit.org/show_bug.cgi?id=234567
Reviewed by Filip Pizlo.
Source/ThirdParty/ANGLE:
Eliminated the creation of symlinks for ANGLE as it is under WebCore.
* ANGLE.xcodeproj/project.pbxproj:
* Configurations/ANGLE-dynamic.xcconfig:
Source/WebCore:
Covered by existing tests.
Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
* WebCore.xcodeproj/project.pbxproj:
Source/WebGPU:
Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
* WebGPU.xcodeproj/project.pbxproj:
Source/WebInspectorUI:
Moved OUTPUT_ALTERNATE_ROOT_PATH in create symlink script from outputFileListPaths to outputPaths.
* WebInspectorUI.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebGPU/ChangeLog
trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (287325 => 287326)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-12-21 19:36:05 UTC (rev 287325)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-12-21 20:16:05 UTC (rev 287326)
@@ -3508,7 +3508,6 @@
31CD00CE2491974C00486F27 /* CopyFiles */,
31CD00CF2491976800486F27 /* CopyFiles */,
31CD00D2249197FD00486F27 /* Adjust ANGLE Paths */,
-6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */,
);
buildRules = (
31A9E9A0249AA04200C7E243 /* PBXBuildRule */,
@@ -3597,25 +3596,6 @@
shellPath = /bin/sh;
shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n# In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\nexit 0\nfi\n\nexec \"$SRCROOT/adjust-angle-include-paths.py\"\n";
};
- 6577FFC5276AC8630011AEC8 /* Create Symlink to Alt Root Path */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 8;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- );
- name = "Create Symlink to Alt Root Path";
- outputFileListPaths = (
- );
- outputPaths = (
-"${OUTPUT_ALTERNATE_ROOT_PATH}",
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/zsh;
- shellScript = "\"${SRCROOT}/scripts/create-symlink-to-altroot.sh\"\n";
- };
FFDA50D5269F895400AE11E2 /* Bake Metal Library to NSData */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287325 => 287326)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-21 19:36:05 UTC (rev 287325)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-21 20:16:05 UTC (rev 287326)
@@ -1,3 +1,15 @@
+2021-12-21 Michael Saboff
+
+Fix symlinks for alternate root framework locations
+https://bugs.webkit.org/show_bug.cgi?id=234567
+
+Reviewed by Filip Pizlo.
+
+Eliminated the creation of symlinks for ANGLE as it is under WebCore.
+
+* ANGLE.xcodeproj/project.pbxproj:
+* Configurations/ANGLE-dynamic.xcconfig:
+
2021-12-21 Arcady Goldmints-Orlov
[GTK] build fails with undefined symbol in ANGLE if USE_ANGLE_WEBGL is enabled.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (287325 => 287326)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-21 19:36:05 UTC (rev 287325)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-21 20:16:05 UTC (rev 287326)
@@ -30,11 +30,6 @@
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_ = $(DYLIB_INSTALL_NAME_BASE);
DYLIB_INSTALL_NAME_BASE_WK_RELOCATABLE_FRAMEWORKS_YES = @loader_path/../../../;
-ALTERNATE_ROOT_PATH = $(DYLIB_INSTALL_NAME_BASE);
-
-OUTPUT_ALTERNATE_ROOT_PATH = $(OUTPUT_ALTERNATE_ROOT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-OUTPUT_ALTERNATE_ROOT_PATH_YES = $(DSTROOT)$(ALTERNATE_ROOT_PATH)/$(FULL_PRODUCT_NAME);
-
HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google ${DERIVED_FILES_DIR};
ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
Modified: trunk/Source/WebCore/ChangeLog (287325 => 287326)
--- trunk/Source/WebCore/ChangeLog 2021-12-21 19:36:05 UTC (rev 287325)
+++ trunk/Source/WebCore/ChangeLog 2021-12-21 20:16:05 UTC (rev 287326)
@@ -1,3
[webkit-changes] [287137] trunk/Source
Title: [287137] trunk/Source Revision 287137 Author msab...@apple.com Date 2021-12-16 08:48:23 -0800 (Thu, 16 Dec 2021) Log Message Source/_javascript_Core: Create symlinks pointing to alternate root framework locations https://bugs.webkit.org/show_bug.cgi?id=234374 Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * Configurations/_javascript_Core.xcconfig: * _javascript_Core.xcodeproj/project.pbxproj: * Scripts/create-symlink-to-altroot.sh: Added. Source/ThirdParty/ANGLE: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * ANGLE.xcodeproj/project.pbxproj: * Configurations/ANGLE-dynamic.xcconfig: * scripts/create-symlink-to-altroot.sh: Added. Source/ThirdParty/libwebrtc: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * Configurations/libwebrtc.xcconfig: Source/WebCore: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. Covered by existing tests. * Configurations/WebCore.xcconfig: * Scripts/create-symlink-to-altroot.sh: Added. * WebCore.xcodeproj/project.pbxproj: Source/WebGPU: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * Configurations/WebGPU.xcconfig: * Scripts: Added. * Scripts/create-symlink-to-altroot.sh: Added. * WebGPU.xcodeproj/project.pbxproj: Source/WebInspectorUI: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * Configurations/WebInspectorUIFramework.xcconfig: * Scripts/create-symlink-to-altroot.sh: Added. * WebInspectorUI.xcodeproj/project.pbxproj: Source/WebKit: https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Filip Pizlo. Added build variables and build step to create symlinks pointing to the alternate build locations from the current framework install location. * Configurations/BaseXPCService.xcconfig: * Configurations/adattributiond.xcconfig: * Configurations/webpushd.xcconfig: * Scripts/create-symlink-to-altroot.sh: Added. * WebKit.xcodeproj/project.pbxproj: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig trunk/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig trunk/Source/WebKit/Configurations/adattributiond.xcconfig trunk/Source/WebKit/Configurations/webpushd.xcconfig trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj Added Paths trunk/Source/_javascript_Core/Scripts/create-symlink-to-altroot.sh trunk/Source/ThirdParty/ANGLE/scripts/create-symlink-to-altroot.sh trunk/Source/WebCore/Scripts/create-symlink-to-altroot.sh trunk/Source/WebGPU/Scripts/ trunk/Source/WebGPU/Scripts/create-symlink-to-altroot.sh trunk/Source/WebInspectorUI/Scripts/create-symlink-to-altroot.sh trunk/Source/WebKit/Scripts/create-symlink-to-altroot.sh Diff Modified: trunk/Source/_javascript_Core/ChangeLog (287136 => 287137) --- trunk/Source/_javascript_Core/ChangeLog 2021-12-16 16:10:09 UTC (rev 287136) +++ trunk/Source/_javascript_Core/ChangeLog 2021-12-16 16:48:23 UTC (rev 287137) @@ -1,3 +1,17 @@ +2021-12-16 Michael Saboff + +
[webkit-changes] [286896] trunk/Source
Title: [286896] trunk/Source Revision 286896 Author msab...@apple.com Date 2021-12-10 18:32:03 -0800 (Fri, 10 Dec 2021) Log Message https://bugs.webkit.org/show_bug.cgi?id=234173 Update Install Paths for build system changes Reviewed by Yusuke Suzuki. Updated install paths for changes in the build system that use a system path prefix. Source/_javascript_Core: * Configurations/Base.xcconfig: Source/ThirdParty/ANGLE: * Configurations/ANGLE-dynamic.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/libwebrtc.xcconfig: Source/WebCore: Covered by existing tests. * Configurations/WebCore.xcconfig: Source/WebGPU: * Configurations/WebGPU.xcconfig: Source/WebInspectorUI: * Configurations/WebInspectorUIFramework.xcconfig: Source/WebKit: * Configurations/BaseTarget.xcconfig: * Configurations/WebKit.xcconfig: Source/WebKitLegacy/mac: * Configurations/WebKitLegacy.xcconfig: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/Base.xcconfig trunk/Source/ThirdParty/ANGLE/ChangeLog trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig trunk/Source/ThirdParty/libwebrtc/ChangeLog trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/WebCore.xcconfig trunk/Source/WebGPU/ChangeLog trunk/Source/WebGPU/Configurations/WebGPU.xcconfig trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/Configurations/BaseTarget.xcconfig trunk/Source/WebKit/Configurations/WebKit.xcconfig trunk/Source/WebKitLegacy/mac/ChangeLog trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig Diff Modified: trunk/Source/_javascript_Core/ChangeLog (286895 => 286896) --- trunk/Source/_javascript_Core/ChangeLog 2021-12-11 02:26:37 UTC (rev 286895) +++ trunk/Source/_javascript_Core/ChangeLog 2021-12-11 02:32:03 UTC (rev 286896) @@ -1,3 +1,14 @@ +2021-12-10 Michael Saboff + +https://bugs.webkit.org/show_bug.cgi?id=234173 +Update Install Paths for build system changes + +Reviewed by Yusuke Suzuki. + +Updated install paths for changes in the build system that use a system path prefix. + +* Configurations/Base.xcconfig: + 2021-12-10 Mikhail R. Gadelha [JSC][32bit] Add callee save registers for MIPS Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (286895 => 286896) --- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2021-12-11 02:26:37 UTC (rev 286895) +++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2021-12-11 02:32:03 UTC (rev 286896) @@ -163,6 +163,8 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/System/Library/Frameworks; +WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH)); +WK_OVERRIDE_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)/System/Library/Frameworks; WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR)); WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)"; Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (286895 => 286896) --- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-11 02:26:37 UTC (rev 286895) +++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-12-11 02:32:03 UTC (rev 286896) @@ -1,3 +1,14 @@ +2021-12-10 Michael Saboff + +https://bugs.webkit.org/show_bug.cgi?id=234173 +Update Install Paths for build system changes + +Reviewed by Yusuke Suzuki. + +Updated install paths for changes in the build system that use a system path prefix. + +* Configurations/ANGLE-dynamic.xcconfig: + 2021-12-09 Dean Jackson [ANGLE] Code generation happens on each build and produces SCM diffs Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (286895 => 286896) --- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-11 02:26:37 UTC (rev 286895) +++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-12-11 02:32:03 UTC (rev 286896) @@ -14,8 +14,11 @@ ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz; ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz; -INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks; -INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR)); +INSTALL_PATH =
[webkit-changes] [284623] trunk/Source/JavaScriptCore
Title: [284623] trunk/Source/_javascript_Core
Revision 284623
Author msab...@apple.com
Date 2021-10-21 10:54:48 -0700 (Thu, 21 Oct 2021)
Log Message
Add missing overflow check to DFGIntegerRangeOptimizationPhase::filterConstant()
https://bugs.webkit.org/show_bug.cgi?id=232058
Reviewed by Robin Morisset.
Added overflow check.
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (284622 => 284623)
--- trunk/Source/_javascript_Core/ChangeLog 2021-10-21 17:40:23 UTC (rev 284622)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-10-21 17:54:48 UTC (rev 284623)
@@ -1,3 +1,14 @@
+2021-10-21 Michael Saboff
+
+Add missing overflow check to DFGIntegerRangeOptimizationPhase::filterConstant()
+https://bugs.webkit.org/show_bug.cgi?id=232058
+
+Reviewed by Robin Morisset.
+
+Added overflow check.
+
+* dfg/DFGIntegerRangeOptimizationPhase.cpp:
+
2021-10-20 Yusuke Suzuki
*IsSane API's could take in the Structure's we're consulting, or they can be out parameters, so we don't rely on the CPU's memory ordering
Modified: trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp (284622 => 284623)
--- trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2021-10-21 17:40:23 UTC (rev 284622)
+++ trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2021-10-21 17:54:48 UTC (rev 284623)
@@ -568,6 +568,9 @@
switch (other.m_kind) {
case Equal:
+if (differenceOverflows(otherEffectiveRight, thisRight))
+return *this;
+
// Return a version of *this that is Equal to other's constant.
return Relationship(m_left, m_right, Equal, otherEffectiveRight - thisRight);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [284573] trunk/Source/JavaScriptCore
Title: [284573] trunk/Source/_javascript_Core
Revision 284573
Author msab...@apple.com
Date 2021-10-20 14:45:13 -0700 (Wed, 20 Oct 2021)
Log Message
Add missing overflow checks to DFGIntegerRangeOptimizationPhase::isEquivalentTo()
https://bugs.webkit.org/show_bug.cgi?id=232024
Reviewed by Tadeu Zagallo.
Added overflow check before comparing for equality.
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (284572 => 284573)
--- trunk/Source/_javascript_Core/ChangeLog 2021-10-20 21:42:35 UTC (rev 284572)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-10-20 21:45:13 UTC (rev 284573)
@@ -1,3 +1,14 @@
+2021-10-20 Michael Saboff
+
+Add missing overflow checks to DFGIntegerRangeOptimizationPhase::isEquivalentTo()
+https://bugs.webkit.org/show_bug.cgi?id=232024
+
+Reviewed by Tadeu Zagallo.
+
+Added overflow check before comparing for equality.
+
+* dfg/DFGIntegerRangeOptimizationPhase.cpp:
+
2021-10-20 Michael Catanzaro
Do not use strerror()
Modified: trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp (284572 => 284573)
--- trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2021-10-20 21:42:35 UTC (rev 284572)
+++ trunk/Source/_javascript_Core/dfg/DFGIntegerRangeOptimizationPhase.cpp 2021-10-20 21:45:13 UTC (rev 284573)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -228,8 +228,17 @@
if (*this == other)
return true;
-if (m_right->isInt32Constant() && other.m_right->isInt32Constant())
-return (m_right->asInt32() + m_offset) == (other.m_right->asInt32() + other.m_offset);
+if (m_right->isInt32Constant() && other.m_right->isInt32Constant()) {
+int thisRight = m_right->asInt32();
+int otherRight = other.m_right->asInt32();
+
+if (sumOverflows(thisRight, m_offset))
+return false;
+if (sumOverflows(otherRight, other.m_offset))
+return false;
+
+return (thisRight + m_offset) == (otherRight + other.m_offset);
+}
return false;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279927] trunk/Source
Title: [279927] trunk/Source
Revision 279927
Author msab...@apple.com
Date 2021-07-14 15:37:18 -0700 (Wed, 14 Jul 2021)
Log Message
[macOS] Add new entitlement to limit process to a single JIT region
https://bugs.webkit.org/show_bug.cgi?id=227956
Reviewed by Mark Lam.
This macOS entitlement limits a process to a single JIT region.
This matches the behavior on iOS.
* Scripts/process-entitlements.sh:
Source/_javascript_Core:
* entitlements.plist:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Scripts/process-entitlements.sh
trunk/Source/_javascript_Core/entitlements.plist
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Scripts/process-entitlements.sh
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (279926 => 279927)
--- trunk/Source/_javascript_Core/ChangeLog 2021-07-14 22:12:43 UTC (rev 279926)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-07-14 22:37:18 UTC (rev 279927)
@@ -1,3 +1,16 @@
+2021-07-14 Michael Saboff
+
+[macOS] Add new entitlement to limit process to a single JIT region
+https://bugs.webkit.org/show_bug.cgi?id=227956
+
+Reviewed by Mark Lam.
+
+This macOS entitlement limits a process to a single JIT region.
+This matches the behavior on iOS.
+
+* Scripts/process-entitlements.sh:
+* entitlements.plist:
+
2021-07-14 Mark Lam
Speculative fix for failed scope.releaseAssertNoException() after calls to JSMap::create().
Modified: trunk/Source/_javascript_Core/Scripts/process-entitlements.sh (279926 => 279927)
--- trunk/Source/_javascript_Core/Scripts/process-entitlements.sh 2021-07-14 22:12:43 UTC (rev 279926)
+++ trunk/Source/_javascript_Core/Scripts/process-entitlements.sh 2021-07-14 22:37:18 UTC (rev 279927)
@@ -22,6 +22,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
fi
}
@@ -41,6 +42,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
fi
}
@@ -64,6 +66,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
}
@@ -80,6 +83,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
}
Modified: trunk/Source/_javascript_Core/entitlements.plist (279926 => 279927)
--- trunk/Source/_javascript_Core/entitlements.plist 2021-07-14 22:12:43 UTC (rev 279926)
+++ trunk/Source/_javascript_Core/entitlements.plist 2021-07-14 22:37:18 UTC (rev 279927)
@@ -4,6 +4,8 @@
com.apple.private.verified-jit
+ com.apple.security.cs.single-jit
+
dynamic-codesigning
Modified: trunk/Source/WebKit/ChangeLog (279926 => 279927)
--- trunk/Source/WebKit/ChangeLog 2021-07-14 22:12:43 UTC (rev 279926)
+++ trunk/Source/WebKit/ChangeLog 2021-07-14 22:37:18 UTC (rev 279927)
@@ -1,3 +1,15 @@
+2021-07-14 Michael Saboff
+
+[macOS] Add new entitlement to limit process to a single JIT region
+https://bugs.webkit.org/show_bug.cgi?id=227956
+
+Reviewed by Mark Lam.
+
+This macOS entitlement limits a process to a single JIT region.
+This matches the behavior on iOS.
+
+* Scripts/process-entitlements.sh:
+
2021-07-14 Wenson Hsieh
[GPU Process] Dump basic RemoteRenderingBackend state when taking system diagnostics
Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (279926 => 279927)
--- trunk/Source/WebKit/Scripts/process-entitlements.sh 2021-07-14 22:12:43 UTC (rev 279926)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh 2021-07-14 22:37:18 UTC (rev 279927)
@@ -146,6 +146,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
if [[ "${WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT}" == YES ]]
@@ -191,6 +192,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
}
@@ -249,6 +251,7 @@
if (( "${TARGET_MAC_OS_X_VERSION_MAJOR}" >= 12 ))
then
plistbuddy Add :com.apple.private.verified-jit bool YES
+plistbuddy Add :com.apple.security.cs.single-jit bool YES
fi
}
___
[webkit-changes] [279922] trunk/Source/bmalloc
Title: [279922] trunk/Source/bmalloc
Revision 279922
Author msab...@apple.com
Date 2021-07-14 14:18:22 -0700 (Wed, 14 Jul 2021)
Log Message
[BMalloc] Lazily allocate physical pages
https://bugs.webkit.org/show_bug.cgi?id=227957
Reviewed by Mark Lam.
For the Darwin platform we don't need to call madvise(..., MADV_FREE_REUSE) to commit physical
memory to back a range of allocated virtual memory. Instead the kernel will commit pages
as they are touched. This can reduce the footprint of a process when there is sparse access
of allocated memory.
Also fixed a minor bug where we allocate memory, but don't update the amount of physical memory
associated with it.
* bmalloc/Heap.cpp:
(bmalloc::Heap::tryAllocateLargeChunk):
* bmalloc/VMAllocate.h:
(bmalloc::vmAllocatePhysicalPages):
Modified Paths
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc/Heap.cpp
trunk/Source/bmalloc/bmalloc/VMAllocate.h
Diff
Modified: trunk/Source/bmalloc/ChangeLog (279921 => 279922)
--- trunk/Source/bmalloc/ChangeLog 2021-07-14 21:07:48 UTC (rev 279921)
+++ trunk/Source/bmalloc/ChangeLog 2021-07-14 21:18:22 UTC (rev 279922)
@@ -1,3 +1,23 @@
+2021-07-14 Michael Saboff
+
+[BMalloc] Lazily allocate physical pages
+https://bugs.webkit.org/show_bug.cgi?id=227957
+
+Reviewed by Mark Lam.
+
+For the Darwin platform we don't need to call madvise(..., MADV_FREE_REUSE) to commit physical
+memory to back a range of allocated virtual memory. Instead the kernel will commit pages
+as they are touched. This can reduce the footprint of a process when there is sparse access
+of allocated memory.
+
+Also fixed a minor bug where we allocate memory, but don't update the amount of physical memory
+associated with it.
+
+* bmalloc/Heap.cpp:
+(bmalloc::Heap::tryAllocateLargeChunk):
+* bmalloc/VMAllocate.h:
+(bmalloc::vmAllocatePhysicalPages):
+
2021-07-12 Filip Pizlo and Yusuke Suzuki
New malloc algorithm
Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (279921 => 279922)
--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-07-14 21:07:48 UTC (rev 279921)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-07-14 21:18:22 UTC (rev 279922)
@@ -586,7 +586,7 @@
PerProcess::get()->addRange(Range(memory, size));
#endif
-return LargeRange(memory, size, 0, 0, memory);
+return LargeRange(memory, size, size, size, static_cast(memory) + size);
}
size_t Heap::largeSize(UniqueLockHolder&, void* object)
Modified: trunk/Source/bmalloc/bmalloc/VMAllocate.h (279921 => 279922)
--- trunk/Source/bmalloc/bmalloc/VMAllocate.h 2021-07-14 21:07:48 UTC (rev 279921)
+++ trunk/Source/bmalloc/bmalloc/VMAllocate.h 2021-07-14 21:18:22 UTC (rev 279922)
@@ -215,7 +215,11 @@
{
vmValidatePhysical(p, vmSize);
#if BOS(DARWIN)
-SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE));
+BUNUSED_PARAM(p);
+BUNUSED_PARAM(vmSize);
+// For the Darwin platform, we don't need to call madvise(..., MADV_FREE_REUSE)
+// to commit physical memory to back a range of allocated virtual memory.
+// Instead the kernel will commit pages as they are touched.
#else
SYSCALL(madvise(p, vmSize, MADV_NORMAL));
#if BOS(LINUX)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279677] trunk/Source/JavaScriptCore
Title: [279677] trunk/Source/_javascript_Core
Revision 279677
Author msab...@apple.com
Date 2021-07-07 14:55:26 -0700 (Wed, 07 Jul 2021)
Log Message
fitcored crashes at _javascript_Core: JSC::Heap::releaseAccessSlow
https://bugs.webkit.org/show_bug.cgi?id=227767
Reviewed by Geoffrey Garen.
Speculative fix for this crash. We are crashing while destroying the VM as we are about to
release the JSLock. In JSLock::willReleaseLock(), we release heap access. Therefore we don't
need to release it again when undertaking the various shutdown steps in the VM destructor.
Added a new scope class that will only release and then acquire heap access if the caller
currently has heap access.
* heap/ReleaseHeapAccessScope.h:
(JSC::ReleaseHeapAccessIfNeededScope::ReleaseHeapAccessIfNeededScope):
(JSC::ReleaseHeapAccessIfNeededScope::~ReleaseHeapAccessIfNeededScope):
* jit/JITWorklist.cpp:
(JSC::JITWorklist::waitUntilAllPlansForVMAreReady):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/heap/ReleaseHeapAccessScope.h
trunk/Source/_javascript_Core/jit/JITWorklist.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (279676 => 279677)
--- trunk/Source/_javascript_Core/ChangeLog 2021-07-07 21:42:55 UTC (rev 279676)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-07-07 21:55:26 UTC (rev 279677)
@@ -1,3 +1,23 @@
+2021-07-07 Michael Saboff
+
+fitcored crashes at _javascript_Core: JSC::Heap::releaseAccessSlow
+https://bugs.webkit.org/show_bug.cgi?id=227767
+
+Reviewed by Geoffrey Garen.
+
+Speculative fix for this crash. We are crashing while destroying the VM as we are about to
+release the JSLock. In JSLock::willReleaseLock(), we release heap access. Therefore we don't
+need to release it again when undertaking the various shutdown steps in the VM destructor.
+
+Added a new scope class that will only release and then acquire heap access if the caller
+currently has heap access.
+
+* heap/ReleaseHeapAccessScope.h:
+(JSC::ReleaseHeapAccessIfNeededScope::ReleaseHeapAccessIfNeededScope):
+(JSC::ReleaseHeapAccessIfNeededScope::~ReleaseHeapAccessIfNeededScope):
+* jit/JITWorklist.cpp:
+(JSC::JITWorklist::waitUntilAllPlansForVMAreReady):
+
2021-07-07 Yusuke Suzuki
[JSC] Do not allocate JITWorklist if JIT is disabled
Modified: trunk/Source/_javascript_Core/heap/ReleaseHeapAccessScope.h (279676 => 279677)
--- trunk/Source/_javascript_Core/heap/ReleaseHeapAccessScope.h 2021-07-07 21:42:55 UTC (rev 279676)
+++ trunk/Source/_javascript_Core/heap/ReleaseHeapAccessScope.h 2021-07-07 21:55:26 UTC (rev 279677)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -54,5 +54,26 @@
Heap& m_heap;
};
+class ReleaseHeapAccessIfNeededScope {
+public:
+ReleaseHeapAccessIfNeededScope(Heap& heap)
+: m_heap(heap)
+{
+hadHeapAccess = m_heap.hasAccess();
+if (hadHeapAccess)
+m_heap.releaseAccess();
+}
+
+~ReleaseHeapAccessIfNeededScope()
+{
+if (hadHeapAccess)
+m_heap.acquireAccess();
+}
+
+private:
+Heap& m_heap;
+bool hadHeapAccess { false };
+};
+
} // namespace JSC
Modified: trunk/Source/_javascript_Core/jit/JITWorklist.cpp (279676 => 279677)
--- trunk/Source/_javascript_Core/jit/JITWorklist.cpp 2021-07-07 21:42:55 UTC (rev 279676)
+++ trunk/Source/_javascript_Core/jit/JITWorklist.cpp 2021-07-07 21:55:26 UTC (rev 279677)
@@ -173,7 +173,10 @@
// the compiler and then it will be waiting for us to stop. That's a deadlock. We avoid that
// deadlock by relinquishing our heap access, so that the collector pretends that we are stopped
// even if we aren't.
-ReleaseHeapAccessScope releaseHeapAccessScope(vm.heap);
+// There can be the case where we already released heap access, for example when the VM is being
+// destroyed as a result of JSLock::unlock unlocking the last reference to the VM.
+// So we use a Release access scope that checks if we currently have access before releasing and later restoring.
+ReleaseHeapAccessIfNeededScope releaseHeapAccessScope(vm.heap);
// Wait for all of the plans for the given VM to complete. The idea here
// is that we want all of the caller VM's plans to be done. We don't care
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [279621] trunk/Source/bmalloc
Title: [279621] trunk/Source/bmalloc Revision 279621 Author msab...@apple.com Date 2021-07-06 14:20:53 -0700 (Tue, 06 Jul 2021) Log Message [bmalloc] Make adaptive scavenging more precise https://bugs.webkit.org/show_bug.cgi?id=226237 Reviewed by Geoffrey Garen. Reland the adaptive scavenger change for macOS with fix. The bug happens when decommitting large ranges that don't have physical pages. We'd call Heap::decommitLargeRange(), but would only add the range to the decommitter list if there were physical pages associated with the range. We would still perform all the other processing of a decommitted range, including setting the range as not elgible for allocation or merging. Had the range been added to the decommitter list, we would have set the range as elgible after the physical pages were released to the OS. The result is that the range could never be allocated, either by itself or as a larger range merged with adjacent ranges. The fix is to only perform decommit processing of large ranges if they have physical pages. We now check for physical pages before calling Heap::decommitLargeRange(). For ranges that don't have physical pages, they can stay on the free list as elgible without having to round trip through decommit processing. Made a minor change to the calculation of the physical end of the LargeRange created and added to the free list in Heap::deallocateSmallChunk. If the last page in the chunk has a physical page, we set the physical end of the range to the end of the chunk. This is for the case where there is an unusable partial small page at the end of the chunk. * bmalloc/BPlatform.h: * bmalloc/Heap.cpp: (bmalloc::Heap::decommitLargeRange): (bmalloc::Heap::scavenge): (bmalloc::Heap::allocateSmallChunk): (bmalloc::Heap::deallocateSmallChunk): (bmalloc::Heap::allocateSmallPage): (bmalloc::Heap::splitAndAllocate): (bmalloc::Heap::allocateLarge): (bmalloc::Heap::tryAllocateLargeChunk): (bmalloc::Heap::shrinkLarge): (bmalloc::Heap::deallocateLarge): (bmalloc::Heap::scavengeToHighWatermark): Deleted. * bmalloc/Heap.h: * bmalloc/IsoDirectory.h: * bmalloc/IsoDirectoryInlines.h: (bmalloc::passedNumPages>::takeFirstEligible): (bmalloc::passedNumPages>::scavenge): (bmalloc::passedNumPages>::scavengeToHighWatermark): Deleted. * bmalloc/IsoHeapImpl.h: * bmalloc/IsoHeapImplInlines.h: (bmalloc::IsoHeapImpl::scavengeToHighWatermark): Deleted. * bmalloc/IsoSharedHeapInlines.h: (bmalloc::IsoSharedHeap::allocateSlow): * bmalloc/LargeMap.cpp: (bmalloc::LargeMap::add): * bmalloc/LargeRange.h: (bmalloc::LargeRange::LargeRange): (bmalloc::LargeRange::physicalEnd const): (bmalloc::LargeRange::setPhysicalEnd): (bmalloc::LargeRange::clearPhysicalEnd): (bmalloc::LargeRange::setUsedSinceLastScavenge): (bmalloc::merge): (bmalloc::LargeRange::split const): (): Deleted. * bmalloc/Scavenger.cpp: (bmalloc::Scavenger::Scavenger): (bmalloc::Scavenger::scheduleIfUnderMemoryPressure): (bmalloc::Scavenger::schedule): (bmalloc::Scavenger::scavenge): (bmalloc::Scavenger::threadRunLoop): (bmalloc::Scavenger::didStartGrowing): Deleted. (bmalloc::Scavenger::timeSinceLastPartialScavenge): Deleted. (bmalloc::Scavenger::partialScavenge): Deleted. * bmalloc/Scavenger.h: * bmalloc/SmallPage.h: (bmalloc::SmallPage::setUsedSinceLastScavenge): Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/BPlatform.h trunk/Source/bmalloc/bmalloc/Heap.cpp trunk/Source/bmalloc/bmalloc/Heap.h trunk/Source/bmalloc/bmalloc/IsoDirectory.h trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h trunk/Source/bmalloc/bmalloc/LargeMap.cpp trunk/Source/bmalloc/bmalloc/LargeRange.h trunk/Source/bmalloc/bmalloc/Scavenger.cpp trunk/Source/bmalloc/bmalloc/Scavenger.h trunk/Source/bmalloc/bmalloc/SmallPage.h Diff Modified: trunk/Source/bmalloc/ChangeLog (279620 => 279621) --- trunk/Source/bmalloc/ChangeLog 2021-07-06 21:12:55 UTC (rev 279620) +++ trunk/Source/bmalloc/ChangeLog 2021-07-06 21:20:53 UTC (rev 279621) @@ -1,3 +1,80 @@ +2021-07-06 Michael Saboff + +[bmalloc] Make adaptive scavenging more precise +https://bugs.webkit.org/show_bug.cgi?id=226237 + +Reviewed by Geoffrey Garen. + +Reland the adaptive scavenger change for macOS with fix. + +The bug happens when decommitting large ranges that don't have physical pages. +We'd call Heap::decommitLargeRange(), but would only add the range to the +decommitter list if there were physical pages associated with the range. +We would still perform all the other processing of a decommitted range, +including setting the range as not elgible for allocation or merging. +Had the range been added to the decommitter list, we would have set the +range as elgible after the physical pages were released to the OS. +The result is that the range
[webkit-changes] [278447] trunk/Source/bmalloc
Title: [278447] trunk/Source/bmalloc Revision 278447 Author msab...@apple.com Date 2021-06-03 20:45:04 -0700 (Thu, 03 Jun 2021) Log Message 2021-06-03 Michael Saboff Unreviewed, rolling out r278278. https://bugs.webkit.org/show_bug.cgi?id=226237 Made some JSC mini mode and other tests flakey. Reverted changeset: [bmalloc] Make adaptive scavenging more precise https://bugs.webkit.org/show_bug.cgi?id=226237 * bmalloc/BPlatform.h: * bmalloc/Heap.cpp: (bmalloc::Heap::decommitLargeRange): (bmalloc::Heap::scavenge): (bmalloc::Heap::scavengeToHighWatermark): (bmalloc::Heap::allocateSmallChunk): (bmalloc::Heap::deallocateSmallChunk): (bmalloc::Heap::allocateSmallPage): (bmalloc::Heap::splitAndAllocate): (bmalloc::Heap::allocateLarge): (bmalloc::Heap::tryAllocateLargeChunk): (bmalloc::Heap::shrinkLarge): (bmalloc::Heap::deallocateLarge): * bmalloc/Heap.h: * bmalloc/IsoDirectory.h: * bmalloc/IsoDirectoryInlines.h: (bmalloc::passedNumPages>::takeFirstEligible): (bmalloc::passedNumPages>::scavenge): (bmalloc::passedNumPages>::scavengeToHighWatermark): * bmalloc/IsoHeapImpl.h: * bmalloc/IsoHeapImplInlines.h: (bmalloc::IsoHeapImpl::scavengeToHighWatermark): * bmalloc/IsoSharedHeapInlines.h: (bmalloc::IsoSharedHeap::allocateSlow): * bmalloc/LargeMap.cpp: (bmalloc::LargeMap::add): * bmalloc/LargeRange.h: (bmalloc::LargeRange::LargeRange): (bmalloc::LargeRange::setTotalPhysicalSize): (bmalloc::merge): (bmalloc::LargeRange::split const): (bmalloc::LargeRange::physicalEnd const): Deleted. (bmalloc::LargeRange::setPhysicalEnd): Deleted. (bmalloc::LargeRange::clearPhysicalEnd): Deleted. * bmalloc/Scavenger.cpp: (bmalloc::Scavenger::Scavenger): (bmalloc::Scavenger::didStartGrowing): (bmalloc::Scavenger::scheduleIfUnderMemoryPressure): (bmalloc::Scavenger::schedule): (bmalloc::Scavenger::timeSinceLastPartialScavenge): (bmalloc::Scavenger::scavenge): (bmalloc::Scavenger::partialScavenge): (bmalloc::Scavenger::threadRunLoop): * bmalloc/Scavenger.h: * bmalloc/SmallPage.h: Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/BPlatform.h trunk/Source/bmalloc/bmalloc/Heap.cpp trunk/Source/bmalloc/bmalloc/Heap.h trunk/Source/bmalloc/bmalloc/IsoDirectory.h trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h trunk/Source/bmalloc/bmalloc/LargeMap.cpp trunk/Source/bmalloc/bmalloc/LargeRange.h trunk/Source/bmalloc/bmalloc/Scavenger.cpp trunk/Source/bmalloc/bmalloc/Scavenger.h trunk/Source/bmalloc/bmalloc/SmallPage.h Diff Modified: trunk/Source/bmalloc/ChangeLog (278446 => 278447) --- trunk/Source/bmalloc/ChangeLog 2021-06-04 03:42:58 UTC (rev 278446) +++ trunk/Source/bmalloc/ChangeLog 2021-06-04 03:45:04 UTC (rev 278447) @@ -1,3 +1,61 @@ +2021-06-03 Michael Saboff + +Unreviewed, rolling out r278278. +https://bugs.webkit.org/show_bug.cgi?id=226237 + +Made some JSC mini mode and other tests flakey. + +Reverted changeset: + +[bmalloc] Make adaptive scavenging more precise +https://bugs.webkit.org/show_bug.cgi?id=226237 + +* bmalloc/BPlatform.h: +* bmalloc/Heap.cpp: +(bmalloc::Heap::decommitLargeRange): +(bmalloc::Heap::scavenge): +(bmalloc::Heap::scavengeToHighWatermark): +(bmalloc::Heap::allocateSmallChunk): +(bmalloc::Heap::deallocateSmallChunk): +(bmalloc::Heap::allocateSmallPage): +(bmalloc::Heap::splitAndAllocate): +(bmalloc::Heap::allocateLarge): +(bmalloc::Heap::tryAllocateLargeChunk): +(bmalloc::Heap::shrinkLarge): +(bmalloc::Heap::deallocateLarge): +* bmalloc/Heap.h: +* bmalloc/IsoDirectory.h: +* bmalloc/IsoDirectoryInlines.h: +(bmalloc::passedNumPages>::takeFirstEligible): +(bmalloc::passedNumPages>::scavenge): +(bmalloc::passedNumPages>::scavengeToHighWatermark): +* bmalloc/IsoHeapImpl.h: +* bmalloc/IsoHeapImplInlines.h: +(bmalloc::IsoHeapImpl::scavengeToHighWatermark): +* bmalloc/IsoSharedHeapInlines.h: +(bmalloc::IsoSharedHeap::allocateSlow): +* bmalloc/LargeMap.cpp: +(bmalloc::LargeMap::add): +* bmalloc/LargeRange.h: +(bmalloc::LargeRange::LargeRange): +(bmalloc::LargeRange::setTotalPhysicalSize): +(bmalloc::merge): +(bmalloc::LargeRange::split const): +(bmalloc::LargeRange::physicalEnd const): Deleted. +
[webkit-changes] [278278] trunk/Source/bmalloc
Title: [278278] trunk/Source/bmalloc Revision 278278 Author msab...@apple.com Date 2021-05-31 08:04:24 -0700 (Mon, 31 May 2021) Log Message [bmalloc] Make adaptive scavenging more precise https://bugs.webkit.org/show_bug.cgi?id=226237 Reviewed by Geoffrey Garen. This patch re-enables the adaptive scavenger for macOS. It is much more precise when calling madvise() by keeping track of the maximum extent of physically mapped memory in a LargeRange. For example, in the prior code, we'd return a small range back to a Gigacage LargeRange whithout any physical pages. When we scavenge that LargeRange, we madvise() the whole Gigacage range. Although this didn't cause correctness issues, it was quite wasteful. In the tests I did with this patch compared to the earlier adaptive change, the number of madvise calls we made drops by ~18% and the time spent in those calls dropped ~13% on an Apple silicon mac and ~30% on an x86 mac. This was measured using dtrace running JetStream2 from the command line. RAMification results improved ~1% over the adptive change. There is the possible future optimization where we also keep track of the first address of physically mapped memory in a LargeRange. Since bmalloc allocates memory from lower addresses first, it is thought that the change in this patch is sufficient to reduce not only the number of madvise calls, but the time it takes to make those calls. * bmalloc/BPlatform.h: * bmalloc/Heap.cpp: (bmalloc::Heap::decommitLargeRange): (bmalloc::Heap::scavenge): (bmalloc::Heap::allocateSmallChunk): (bmalloc::Heap::deallocateSmallChunk): (bmalloc::Heap::allocateSmallPage): (bmalloc::Heap::splitAndAllocate): (bmalloc::Heap::allocateLarge): (bmalloc::Heap::tryAllocateLargeChunk): (bmalloc::Heap::shrinkLarge): (bmalloc::Heap::deallocateLarge): (bmalloc::Heap::scavengeToHighWatermark): Deleted. * bmalloc/Heap.h: * bmalloc/IsoDirectory.h: * bmalloc/IsoDirectoryInlines.h: (bmalloc::passedNumPages>::takeFirstEligible): (bmalloc::passedNumPages>::scavenge): (bmalloc::passedNumPages>::scavengeToHighWatermark): Deleted. * bmalloc/IsoHeapImpl.h: * bmalloc/IsoHeapImplInlines.h: (bmalloc::IsoHeapImpl::scavengeToHighWatermark): Deleted. * bmalloc/LargeMap.cpp: (bmalloc::LargeMap::add): * bmalloc/LargeRange.h: (bmalloc::LargeRange::LargeRange): (bmalloc::LargeRange::physicalExtent const): (bmalloc::LargeRange::setPhysicalExtent): (bmalloc::LargeRange::resetPhysicalExtent): (bmalloc::LargeRange::setUsedSinceLastScavenge): (bmalloc::merge): (bmalloc::LargeRange::split const): (): Deleted. * bmalloc/Scavenger.cpp: (bmalloc::Scavenger::Scavenger): (bmalloc::Scavenger::scavenge): (bmalloc::Scavenger::threadRunLoop): (bmalloc::Scavenger::timeSinceLastPartialScavenge): Deleted. (bmalloc::Scavenger::partialScavenge): Deleted. * bmalloc/Scavenger.h: * bmalloc/SmallPage.h: (bmalloc::SmallPage::setUsedSinceLastScavenge): Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/BPlatform.h trunk/Source/bmalloc/bmalloc/Heap.cpp trunk/Source/bmalloc/bmalloc/Heap.h trunk/Source/bmalloc/bmalloc/IsoDirectory.h trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h trunk/Source/bmalloc/bmalloc/LargeMap.cpp trunk/Source/bmalloc/bmalloc/LargeRange.h trunk/Source/bmalloc/bmalloc/Scavenger.cpp trunk/Source/bmalloc/bmalloc/Scavenger.h trunk/Source/bmalloc/bmalloc/SmallPage.h Diff Modified: trunk/Source/bmalloc/ChangeLog (278277 => 278278) --- trunk/Source/bmalloc/ChangeLog 2021-05-31 15:02:54 UTC (rev 278277) +++ trunk/Source/bmalloc/ChangeLog 2021-05-31 15:04:24 UTC (rev 278278) @@ -1,3 +1,73 @@ +2021-05-31 Michael Saboff + +[bmalloc] Make adaptive scavenging more precise +https://bugs.webkit.org/show_bug.cgi?id=226237 + +Reviewed by Geoffrey Garen. + +This patch re-enables the adaptive scavenger for macOS. +It is much more precise when calling madvise() by keeping track of the +maximum extent of physically mapped memory in a LargeRange. For example, +in the prior code, we'd return a small range back to a Gigacage LargeRange +whithout any physical pages. When we scavenge that LargeRange, we madvise() +the whole Gigacage range. Although this didn't cause correctness issues, +it was quite wasteful. + +In the tests I did with this patch compared to the earlier adaptive change, +the number of madvise calls we made drops by ~18% and the time spent in those +calls dropped ~13% on an Apple silicon mac and ~30% on an x86 mac. +This was measured using dtrace running JetStream2 from the command line. +RAMification results improved ~1% over the adptive change. + +There is the possible future optimization where we also keep track of the +first address of physically mapped memory in a LargeRange. Since
[webkit-changes] [277898] trunk/Source/bmalloc
Title: [277898] trunk/Source/bmalloc
Revision 277898
Author msab...@apple.com
Date 2021-05-21 16:36:47 -0700 (Fri, 21 May 2021)
Log Message
[bmalloc] Rollout r276266 because WebKit processes are spending much more time in madvise
https://bugs.webkit.org/show_bug.cgi?id=226122
Unreviewed rollout.
Rolling out r276266 to do some automated testing. At the same time, we'll work on changing the madvise() decommitting to be more precise.
* bmalloc/BPlatform.h:
* bmalloc/Heap.cpp:
(bmalloc::Heap::scavenge):
(bmalloc::Heap::scavengeToHighWatermark):
(bmalloc::Heap::allocateSmallChunk):
(bmalloc::Heap::allocateSmallPage):
(bmalloc::Heap::allocateLarge):
* bmalloc/Heap.h:
* bmalloc/IsoDirectory.h:
* bmalloc/IsoDirectoryInlines.h:
(bmalloc::passedNumPages>::takeFirstEligible):
(bmalloc::passedNumPages>::scavenge):
(bmalloc::passedNumPages>::scavengeToHighWatermark):
* bmalloc/IsoHeapImpl.h:
* bmalloc/IsoHeapImplInlines.h:
(bmalloc::IsoHeapImpl::scavengeToHighWatermark):
* bmalloc/LargeMap.cpp:
(bmalloc::LargeMap::add):
* bmalloc/LargeRange.h:
(bmalloc::LargeRange::LargeRange):
(bmalloc::merge):
* bmalloc/Scavenger.cpp:
(bmalloc::Scavenger::Scavenger):
(bmalloc::Scavenger::timeSinceLastPartialScavenge):
(bmalloc::Scavenger::scavenge):
(bmalloc::Scavenger::partialScavenge):
(bmalloc::Scavenger::threadRunLoop):
* bmalloc/Scavenger.h:
* bmalloc/SmallPage.h:
Modified Paths
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc/BPlatform.h
trunk/Source/bmalloc/bmalloc/Heap.cpp
trunk/Source/bmalloc/bmalloc/Heap.h
trunk/Source/bmalloc/bmalloc/IsoDirectory.h
trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h
trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h
trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h
trunk/Source/bmalloc/bmalloc/LargeMap.cpp
trunk/Source/bmalloc/bmalloc/LargeRange.h
trunk/Source/bmalloc/bmalloc/Scavenger.cpp
trunk/Source/bmalloc/bmalloc/Scavenger.h
trunk/Source/bmalloc/bmalloc/SmallPage.h
Diff
Modified: trunk/Source/bmalloc/ChangeLog (277897 => 277898)
--- trunk/Source/bmalloc/ChangeLog 2021-05-21 23:09:17 UTC (rev 277897)
+++ trunk/Source/bmalloc/ChangeLog 2021-05-21 23:36:47 UTC (rev 277898)
@@ -1,3 +1,42 @@
+2021-05-21 Michael Saboff
+
+[bmalloc] Rollout r276266 because WebKit processes are spending much more time in madvise
+https://bugs.webkit.org/show_bug.cgi?id=226122
+
+Unreviewed rollout.
+
+Rolling out r276266 to do some automated testing. At the same time, we'll work on changing the madvise() decommitting to be more precise.
+
+* bmalloc/BPlatform.h:
+* bmalloc/Heap.cpp:
+(bmalloc::Heap::scavenge):
+(bmalloc::Heap::scavengeToHighWatermark):
+(bmalloc::Heap::allocateSmallChunk):
+(bmalloc::Heap::allocateSmallPage):
+(bmalloc::Heap::allocateLarge):
+* bmalloc/Heap.h:
+* bmalloc/IsoDirectory.h:
+* bmalloc/IsoDirectoryInlines.h:
+(bmalloc::passedNumPages>::takeFirstEligible):
+(bmalloc::passedNumPages>::scavenge):
+(bmalloc::passedNumPages>::scavengeToHighWatermark):
+* bmalloc/IsoHeapImpl.h:
+* bmalloc/IsoHeapImplInlines.h:
+(bmalloc::IsoHeapImpl::scavengeToHighWatermark):
+* bmalloc/LargeMap.cpp:
+(bmalloc::LargeMap::add):
+* bmalloc/LargeRange.h:
+(bmalloc::LargeRange::LargeRange):
+(bmalloc::merge):
+* bmalloc/Scavenger.cpp:
+(bmalloc::Scavenger::Scavenger):
+(bmalloc::Scavenger::timeSinceLastPartialScavenge):
+(bmalloc::Scavenger::scavenge):
+(bmalloc::Scavenger::partialScavenge):
+(bmalloc::Scavenger::threadRunLoop):
+* bmalloc/Scavenger.h:
+* bmalloc/SmallPage.h:
+
2021-04-19 Michael Saboff
[bmalloc] Enable Adaptive Scavenger for Mac
Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (277897 => 277898)
--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2021-05-21 23:09:17 UTC (rev 277897)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2021-05-21 23:36:47 UTC (rev 277898)
@@ -309,6 +309,12 @@
/* This is used for debugging when hacking on how bmalloc calculates its physical footprint. */
#define ENABLE_PHYSICAL_PAGE_MAP 0
+#if BPLATFORM(MAC)
+#define BUSE_PARTIAL_SCAVENGE 1
+#else
+#define BUSE_PARTIAL_SCAVENGE 0
+#endif
+
#if !defined(BUSE_PRECOMPUTED_CONSTANTS_VMPAGE4K)
#define BUSE_PRECOMPUTED_CONSTANTS_VMPAGE4K 1
#endif
Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (277897 => 277898)
--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-05-21 23:09:17 UTC (rev 277897)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-05-21 23:36:47 UTC (rev 277898)
@@ -119,7 +119,11 @@
#endif
}
+#if BUSE(PARTIAL_SCAVENGE)
+void Heap::scavenge(UniqueLockHolder& lock, BulkDecommit& decommitter)
+#else
void Heap::scavenge(UniqueLockHolder& lock, BulkDecommit& decommitter, size_t& deferredDecommits)
+#endif
{
for (auto& list : m_freePages) {
for (auto* chunk : list) {
@@ -126,11 +130,13 @@
[webkit-changes] [276527] trunk/Source/JavaScriptCore
Title: [276527] trunk/Source/_javascript_Core
Revision 276527
Author msab...@apple.com
Date 2021-04-23 16:06:12 -0700 (Fri, 23 Apr 2021)
Log Message
[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
https://bugs.webkit.org/show_bug.cgi?id=224983
Reviewed by Mark Lam.
When we backtrack a parentheses with a greedy non zero based quantifier,
we don't properly restore for the case where we hadn't reached the minimum count.
We now save the input position on entry and restore it when we backtrack for
this case. We also properly release the allocated ParenthesesDisjunctionContext's.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::matchParentheses):
(JSC::Yarr::Interpreter::backtrackParentheses):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (276526 => 276527)
--- trunk/Source/_javascript_Core/ChangeLog 2021-04-23 23:01:48 UTC (rev 276526)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-04-23 23:06:12 UTC (rev 276527)
@@ -1,3 +1,19 @@
+2021-04-23 Michael Saboff
+
+[YARR Interpreter] Improper backtrack of parentheses with non-zero based greedy quantifiers
+https://bugs.webkit.org/show_bug.cgi?id=224983
+
+Reviewed by Mark Lam.
+
+When we backtrack a parentheses with a greedy non zero based quantifier,
+we don't properly restore for the case where we hadn't reached the minimum count.
+We now save the input position on entry and restore it when we backtrack for
+this case. We also properly release the allocated ParenthesesDisjunctionContext's.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::matchParentheses):
+(JSC::Yarr::Interpreter::backtrackParentheses):
+
2021-04-23 Mark Lam
Fix B3 strength reduction for shl.
Modified: trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp (276526 => 276527)
--- trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:01:48 UTC (rev 276526)
+++ trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-04-23 23:06:12 UTC (rev 276527)
@@ -45,6 +45,7 @@
struct ParenthesesDisjunctionContext;
struct BackTrackInfoParentheses {
+uintptr_t begin;
uintptr_t matchAmount;
ParenthesesDisjunctionContext* lastContext;
};
@@ -1022,6 +1023,7 @@
BackTrackInfoParentheses* backTrack = reinterpret_cast(context->frame + term.frameLocation);
ByteDisjunction* disjunctionBody = term.atom.parenthesesDisjunction;
+backTrack->begin = input.getPos();
backTrack->matchAmount = 0;
backTrack->lastContext = nullptr;
@@ -1175,8 +1177,20 @@
popParenthesesDisjunctionContext(backTrack);
freeParenthesesDisjunctionContext(context);
-if (result != JSRegExpNoMatch || backTrack->matchAmount < term.atom.quantityMinCount)
+if (backTrack->matchAmount < term.atom.quantityMinCount) {
+while (backTrack->matchAmount) {
+context = backTrack->lastContext;
+resetMatches(term, context);
+popParenthesesDisjunctionContext(backTrack);
+freeParenthesesDisjunctionContext(context);
+}
+
+input.setPos(backTrack->begin);
return result;
+}
+
+if (result != JSRegExpNoMatch)
+return result;
}
if (backTrack->matchAmount) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [276266] trunk/Source/bmalloc
Title: [276266] trunk/Source/bmalloc Revision 276266 Author msab...@apple.com Date 2021-04-19 11:52:25 -0700 (Mon, 19 Apr 2021) Log Message [bmalloc] Enable Adaptive Scavenger for Mac https://bugs.webkit.org/show_bug.cgi?id=224706 Reviewed by Filip Pizlo. Enabled the adaptive scavenger code paths for macOS. The original reason that the partial scavenging paths were kept for macOS was due to regression on power tests. To alleviate the power regression, this patch splits out the adaptive scavenger parameters with macOS specific values. The parameters are: The multiplier used to compute the next scavenging wait time based on the time needed for the prior scavenging. Minimum wait time between scavenging. Maximum wait time between scavenging. The values in the current code are: Wait time Multiplier: 150 Minimum wait time: 100ms Maximum wait time: 10,000ms (10 seconds) The proposed values for macOS, determined using empirical testing. Wait time Multiplier: 300 Minimum wait time: 750ms Maximum wait time: 20,000ms (20 seconds) When tested on various mac variants, this change: * Provides a 3-5% reduction in memory use on RAMification. * It is neutral on JetStream2. * It is neutral to a slight regression on Speedometer2, but there is some variability in those results. Since macOS was the only platform still using the partial scavenging code path, the partial scavenging code paths were deleted. * bmalloc/BPlatform.h: * bmalloc/Heap.cpp: (bmalloc::Heap::scavenge): (bmalloc::Heap::allocateSmallChunk): (bmalloc::Heap::allocateSmallPage): (bmalloc::Heap::allocateLarge): (bmalloc::Heap::scavengeToHighWatermark): Deleted. * bmalloc/Heap.h: * bmalloc/IsoDirectory.h: * bmalloc/IsoDirectoryInlines.h: (bmalloc::passedNumPages>::takeFirstEligible): (bmalloc::passedNumPages>::scavenge): (bmalloc::passedNumPages>::scavengeToHighWatermark): Deleted. * bmalloc/IsoHeapImpl.h: * bmalloc/IsoHeapImplInlines.h: (bmalloc::IsoHeapImpl::scavengeToHighWatermark): Deleted. * bmalloc/LargeMap.cpp: (bmalloc::LargeMap::add): * bmalloc/LargeRange.h: (bmalloc::LargeRange::LargeRange): (bmalloc::LargeRange::setUsedSinceLastScavenge): (bmalloc::merge): (): Deleted. * bmalloc/Scavenger.cpp: (bmalloc::Scavenger::Scavenger): (bmalloc::Scavenger::scavenge): (bmalloc::Scavenger::threadRunLoop): (bmalloc::Scavenger::timeSinceLastPartialScavenge): Deleted. (bmalloc::Scavenger::partialScavenge): Deleted. * bmalloc/Scavenger.h: * bmalloc/SmallPage.h: (bmalloc::SmallPage::setUsedSinceLastScavenge): Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/BPlatform.h trunk/Source/bmalloc/bmalloc/Heap.cpp trunk/Source/bmalloc/bmalloc/Heap.h trunk/Source/bmalloc/bmalloc/IsoDirectory.h trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h trunk/Source/bmalloc/bmalloc/LargeMap.cpp trunk/Source/bmalloc/bmalloc/LargeRange.h trunk/Source/bmalloc/bmalloc/Scavenger.cpp trunk/Source/bmalloc/bmalloc/Scavenger.h trunk/Source/bmalloc/bmalloc/SmallPage.h Diff Modified: trunk/Source/bmalloc/ChangeLog (276265 => 276266) --- trunk/Source/bmalloc/ChangeLog 2021-04-19 18:21:54 UTC (rev 276265) +++ trunk/Source/bmalloc/ChangeLog 2021-04-19 18:52:25 UTC (rev 276266) @@ -1,3 +1,73 @@ +2021-04-19 Michael Saboff + +[bmalloc] Enable Adaptive Scavenger for Mac +https://bugs.webkit.org/show_bug.cgi?id=224706 + +Reviewed by Filip Pizlo. + +Enabled the adaptive scavenger code paths for macOS. +The original reason that the partial scavenging paths were kept for macOS was due +to regression on power tests. To alleviate the power regression, this patch splits +out the adaptive scavenger parameters with macOS specific values. + +The parameters are: + The multiplier used to compute the next scavenging wait time based on the +time needed for the prior scavenging. + Minimum wait time between scavenging. + Maximum wait time between scavenging. + +The values in the current code are: + Wait time Multiplier: 150 + Minimum wait time: 100ms + Maximum wait time: 10,000ms (10 seconds) + +The proposed values for macOS, determined using empirical testing. + Wait time Multiplier: 300 + Minimum wait time: 750ms + Maximum wait time: 20,000ms (20 seconds) + +When tested on various mac variants, this change: + * Provides a 3-5% reduction in memory use on RAMification. + * It is neutral on JetStream2. + * It is neutral to a slight regression on Speedometer2, but there is some + variability in those results. + +Since macOS was the only platform still using the partial scavenging code path, +the partial scavenging code paths were deleted. + +* bmalloc/BPlatform.h: +* bmalloc/Heap.cpp: +
[webkit-changes] [274945] trunk
Title: [274945] trunk
Revision 274945
Author msab...@apple.com
Date 2021-03-24 10:29:02 -0700 (Wed, 24 Mar 2021)
Log Message
[YARR] Interpreter incorrectly matches non-BMP characters with multiple . w/dotAll flag
https://bugs.webkit.org/show_bug.cgi?id=223666
Reviewed by Mark Lam.
JSTests:
Added tests for dotAll. Also made sure that we test both JIT and non-JIT execution.
* stress/regexp-dot-match-nonBMP.js:
Source/_javascript_Core:
In checkCharacterClassDontAdvanceInputForNonBMP(), we need to check for input.readChecked() returning -1
and return that the character class didn't match.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::checkCharacterClassDontAdvanceInputForNonBMP):
Modified Paths
trunk/JSTests/ChangeLog
trunk/JSTests/stress/regexp-dot-match-nonBMP.js
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Diff
Modified: trunk/JSTests/ChangeLog (274944 => 274945)
--- trunk/JSTests/ChangeLog 2021-03-24 17:03:09 UTC (rev 274944)
+++ trunk/JSTests/ChangeLog 2021-03-24 17:29:02 UTC (rev 274945)
@@ -1,3 +1,14 @@
+2021-03-24 Michael Saboff
+
+[YARR] Interpreter incorrectly matches non-BMP characters with multiple . w/dotAll flag
+https://bugs.webkit.org/show_bug.cgi?id=223666
+
+Reviewed by Mark Lam.
+
+Added tests for dotAll. Also made sure that we test both JIT and non-JIT execution.
+
+* stress/regexp-dot-match-nonBMP.js:
+
2021-03-24 Yusuke Suzuki
[JSC] Rope string equal operation should first check length
Modified: trunk/JSTests/stress/regexp-dot-match-nonBMP.js (274944 => 274945)
--- trunk/JSTests/stress/regexp-dot-match-nonBMP.js 2021-03-24 17:03:09 UTC (rev 274944)
+++ trunk/JSTests/stress/regexp-dot-match-nonBMP.js 2021-03-24 17:29:02 UTC (rev 274945)
@@ -1,3 +1,6 @@
+//@ runDefault
+//@ runNoJIT
+
function shouldMatch(regexp, str) {
let result = regexp.test(str);
if (result !== true)
@@ -18,3 +21,10 @@
shouldntMatch(/../u, s);
shouldntMatch(/.../, s);
shouldntMatch(/.../u, s);
+
+shouldMatch(/./s, s);
+shouldMatch(/./su, s);
+shouldMatch(/../s, s);
+shouldntMatch(/../su, s);
+shouldntMatch(/.../s, s);
+shouldntMatch(/.../su, s);
Modified: trunk/Source/_javascript_Core/ChangeLog (274944 => 274945)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-24 17:03:09 UTC (rev 274944)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-24 17:29:02 UTC (rev 274945)
@@ -1,3 +1,16 @@
+2021-03-24 Michael Saboff
+
+[YARR] Interpreter incorrectly matches non-BMP characters with multiple . w/dotAll flag
+https://bugs.webkit.org/show_bug.cgi?id=223666
+
+Reviewed by Mark Lam.
+
+In checkCharacterClassDontAdvanceInputForNonBMP(), we need to check for input.readChecked() returning -1
+and return that the character class didn't match.
+
+* yarr/YarrInterpreter.cpp:
+(JSC::Yarr::Interpreter::checkCharacterClassDontAdvanceInputForNonBMP):
+
2021-03-24 Saam Barati
r271034 added code in constant folding phase that's unreachable given current invariants of our ICs and PutByIdStatus
Modified: trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp (274944 => 274945)
--- trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-03-24 17:03:09 UTC (rev 274944)
+++ trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2021-03-24 17:29:02 UTC (rev 274945)
@@ -436,6 +436,9 @@
bool checkCharacterClassDontAdvanceInputForNonBMP(CharacterClass* characterClass, unsigned negativeInputOffset)
{
int readCharacter = characterClass->hasOnlyNonBMPCharacters() ? input.readSurrogatePairChecked(negativeInputOffset) : input.readChecked(negativeInputOffset);
+if (readCharacter < 0)
+return false;
+
return testCharacterClass(characterClass, readCharacter);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [274806] trunk
Title: [274806] trunk
Revision 274806
Author msab...@apple.com
Date 2021-03-22 15:06:52 -0700 (Mon, 22 Mar 2021)
Log Message
[YARR] Interpreter incorrectly matches non-BMP characters with multiple .
https://bugs.webkit.org/show_bug.cgi?id=223498
Reviewed by Yusuke Suzuki.
JSTests:
New test.
* stress/regexp-dot-match-nonBMP.js: Added.
(shouldMatch):
(shouldntMatch):
Source/_javascript_Core:
We need to check that we read an actual character before seeing if it is part of a character class.
In the case where we are checking that a character is not in a character class, like .,
the failed to read result from input.readChecked(), -1, is not part of the newline character class.
This will allow regular expressions that require more than the number of characters in a string
to match.
* yarr/YarrInterpreter.cpp:
(JSC::Yarr::Interpreter::checkCharacterClass):
LayoutTests:
Updated test.
* fast/forms/ValidityState-patternMismatch-expected.txt:
* fast/forms/ValidityState-patternMismatch.html:
Modified Paths
trunk/JSTests/ChangeLog
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/forms/ValidityState-patternMismatch-expected.txt
trunk/LayoutTests/fast/forms/ValidityState-patternMismatch.html
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrInterpreter.cpp
Added Paths
trunk/JSTests/stress/regexp-dot-match-nonBMP.js
Diff
Modified: trunk/JSTests/ChangeLog (274805 => 274806)
--- trunk/JSTests/ChangeLog 2021-03-22 22:05:48 UTC (rev 274805)
+++ trunk/JSTests/ChangeLog 2021-03-22 22:06:52 UTC (rev 274806)
@@ -1,3 +1,16 @@
+2021-03-22 Michael Saboff
+
+[YARR] Interpreter incorrectly matches non-BMP characters with multiple .
+https://bugs.webkit.org/show_bug.cgi?id=223498
+
+Reviewed by Yusuke Suzuki.
+
+New test.
+
+* stress/regexp-dot-match-nonBMP.js: Added.
+(shouldMatch):
+(shouldntMatch):
+
2021-03-22 Yusuke Suzuki
[JSC] Intl.Locale should not assume is8Bit
Added: trunk/JSTests/stress/regexp-dot-match-nonBMP.js (0 => 274806)
--- trunk/JSTests/stress/regexp-dot-match-nonBMP.js (rev 0)
+++ trunk/JSTests/stress/regexp-dot-match-nonBMP.js 2021-03-22 22:06:52 UTC (rev 274806)
@@ -0,0 +1,20 @@
+function shouldMatch(regexp, str) {
+let result = regexp.test(str);
+if (result !== true)
+throw new Error("Expected " + regexp + ".test(\"" + str + "\") to be true, but wasn't");
+}
+
+function shouldntMatch(regexp, str) {
+let result = regexp.test(str);
+if (result !== false)
+throw new Error("Expected " + regexp + ".test(\"" + str + "\") to be false, but wasn't");
+}
+
+let s = String.fromCodePoint(0x1);
+
+shouldMatch(/./, s);
+shouldMatch(/./u, s);
+shouldMatch(/../, s);
+shouldntMatch(/../u, s);
+shouldntMatch(/.../, s);
+shouldntMatch(/.../u, s);
Modified: trunk/LayoutTests/ChangeLog (274805 => 274806)
--- trunk/LayoutTests/ChangeLog 2021-03-22 22:05:48 UTC (rev 274805)
+++ trunk/LayoutTests/ChangeLog 2021-03-22 22:06:52 UTC (rev 274806)
@@ -1,3 +1,15 @@
+2021-03-22 Michael Saboff
+
+[YARR] Interpreter incorrectly matches non-BMP characters with multiple .
+https://bugs.webkit.org/show_bug.cgi?id=223498
+
+Reviewed by Yusuke Suzuki.
+
+Updated test.
+
+* fast/forms/ValidityState-patternMismatch-expected.txt:
+* fast/forms/ValidityState-patternMismatch.html:
+
2021-03-22 Chris Gambrell
[LayoutTests] Convert http/tests/multipart convert PHP to Python
Modified: trunk/LayoutTests/fast/forms/ValidityState-patternMismatch-expected.txt (274805 => 274806)
--- trunk/LayoutTests/fast/forms/ValidityState-patternMismatch-expected.txt 2021-03-22 22:05:48 UTC (rev 274805)
+++ trunk/LayoutTests/fast/forms/ValidityState-patternMismatch-expected.txt 2021-03-22 22:06:52 UTC (rev 274806)
@@ -29,7 +29,6 @@
PASS patternMismatchFor("match-19") is false
PASS patternMismatchFor("match-20") is false
PASS patternMismatchFor("match-21") is false
-PASS patternMismatchFor("match-22") is false
PASS patternMismatchFor("wrong-gray-or-grey") is true
PASS patternMismatchFor("gray") is false
PASS patternMismatchFor("grey") is false
@@ -56,6 +55,7 @@
PASS patternMismatchFor("mismatch-20") is true
PASS patternMismatchFor("mismatch-21") is true
PASS patternMismatchFor("mismatch-22") is true
+PASS patternMismatchFor("mismatch-23") is true
PASS patternMismatchFor("empty-pattern-match") is false
PASS patternMismatchFor("empty-pattern-mismatch") is true
PASS patternMismatchFor("invalid-01") is false
Modified: trunk/LayoutTests/fast/forms/ValidityState-patternMismatch.html (274805 => 274806)
--- trunk/LayoutTests/fast/forms/ValidityState-patternMismatch.html 2021-03-22 22:05:48 UTC (rev 274805)
+++ trunk/LayoutTests/fast/forms/ValidityState-patternMismatch.html 2021-03-22 22:06:52 UTC (rev 274806)
@@ -33,7 +33,6 @@
-
/>@@ -60,7 +59,8 @@
/> /> />-/>
+/>
+
@@ -107,7 +107,6 @@
[webkit-changes] [273613] trunk/JSTests
Title: [273613] trunk/JSTests
Revision 273613
Author msab...@apple.com
Date 2021-02-26 18:51:41 -0800 (Fri, 26 Feb 2021)
Log Message
Followup test fix to r273594
https://bugs.webkit.org/show_bug.cgi?id=222506
Reviewed by Yusuke Suzuki.
* stress/regexp-max-size.js:
(testTooBigBMPRegExp):
(testTooBigNonBMPRegExp):
(testAll):
Modified Paths
trunk/JSTests/ChangeLog
trunk/JSTests/stress/regexp-max-size.js
Diff
Modified: trunk/JSTests/ChangeLog (273612 => 273613)
--- trunk/JSTests/ChangeLog 2021-02-27 02:42:24 UTC (rev 273612)
+++ trunk/JSTests/ChangeLog 2021-02-27 02:51:41 UTC (rev 273613)
@@ -1,3 +1,15 @@
+2021-02-26 Michael Saboff
+
+Followup test fix to r273594
+https://bugs.webkit.org/show_bug.cgi?id=222506
+
+Reviewed by Yusuke Suzuki.
+
+* stress/regexp-max-size.js:
+(testTooBigBMPRegExp):
+(testTooBigNonBMPRegExp):
+(testAll):
+
2021-02-26 Saam Barati
Remove bad assertion of AI ArrayMode state in various "by val" opcodes
Modified: trunk/JSTests/stress/regexp-max-size.js (273612 => 273613)
--- trunk/JSTests/stress/regexp-max-size.js 2021-02-27 02:42:24 UTC (rev 273612)
+++ trunk/JSTests/stress/regexp-max-size.js 2021-02-27 02:51:41 UTC (rev 273613)
@@ -17,7 +17,7 @@
}
function testTooBigBMPRegExp() {
-let patt = '\u{1234}{4294967294}\u{4567}';
+let patt = '\u{1234}{4294967295}\u{4567}';
const re = RegExp(patt, 'u');
return "\u{1234}\u{1234}\u{4567}".match(re);
}
@@ -29,13 +29,13 @@
}
function testTooBigNonBMPRegExp() {
-let patt = '\u{10234}{2147483646}\u{10100}';
+let patt = '\u{10234}{2147483647}\u{10100}';
const re = RegExp(patt, 'u');
return "\u{10234}\u{10234}\u{10100}".match(re);
}
-let shouldCompile = [testMaxRegExp, testMaxRegExp, testMaxRegExp];
-let shouldntCompile = [testTooBigRegExp, testTooBigRegExp, testTooBigRegExp];
+let shouldCompile = [testMaxRegExp, testMaxBMPRegExp, testMaxNonBMPRegExp];
+let shouldntCompile = [testTooBigRegExp, testTooBigBMPRegExp, testTooBigNonBMPRegExp];
function testAll()
{
@@ -56,7 +56,7 @@
}
if (notSyntaxError)
-throw "This RegExp: " + shouldntCompile + " should throw a Syntax Error when it is compiled";
+throw "This RegExp: " + shouldntCompile[i] + " should throw a Syntax Error when it is compiled";
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [273594] trunk
Title: [273594] trunk
Revision 273594
Author msab...@apple.com
Date 2021-02-26 15:22:51 -0800 (Fri, 26 Feb 2021)
Log Message
unexpected minimumInputSize in setupDisjunctionOffsets for regexp engine(yarr)
https://bugs.webkit.org/show_bug.cgi?id=220357
Reviewed by Saam Barati.
JSTests:
New tests to check the boundary conditions for overflowing a pattern in a RegExp.
* stress/regexp-max-size.js: Added.
(testMaxRegExp):
(testTooBigRegExp):
(testMaxBMPRegExp):
(testTooBigBMPRegExp):
(testMaxNonBMPRegExp):
(testTooBigNonBMPRegExp):
(testAll):
Source/_javascript_Core:
Removed an unnecessary ASSERT.
This assert checked that the minimum size wasn't UINT_MAX which I believe was
intended to make sure the minimum size was changed while computing the
disjunction's size and offsets. Those calculations involve checked arithmetic,
which would catch any overflow.
The other part of this patch adds a test that checks this condition as well
as the case where the pattern is one character longer, 2^32, which triggers
the arithmetic overflow.
* yarr/YarrPattern.cpp:
(JSC::Yarr::YarrPatternConstructor::setupDisjunctionOffsets):
Modified Paths
trunk/JSTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrPattern.cpp
Added Paths
trunk/JSTests/stress/regexp-max-size.js
Diff
Modified: trunk/JSTests/ChangeLog (273593 => 273594)
--- trunk/JSTests/ChangeLog 2021-02-26 23:20:31 UTC (rev 273593)
+++ trunk/JSTests/ChangeLog 2021-02-26 23:22:51 UTC (rev 273594)
@@ -1,3 +1,21 @@
+2021-02-26 Michael Saboff
+
+unexpected minimumInputSize in setupDisjunctionOffsets for regexp engine(yarr)
+https://bugs.webkit.org/show_bug.cgi?id=220357
+
+Reviewed by Saam Barati.
+
+New tests to check the boundary conditions for overflowing a pattern in a RegExp.
+
+* stress/regexp-max-size.js: Added.
+(testMaxRegExp):
+(testTooBigRegExp):
+(testMaxBMPRegExp):
+(testTooBigBMPRegExp):
+(testMaxNonBMPRegExp):
+(testTooBigNonBMPRegExp):
+(testAll):
+
2021-02-25 Yusuke Suzuki
[JSC] Fix typo in wasm error message
Added: trunk/JSTests/stress/regexp-max-size.js (0 => 273594)
--- trunk/JSTests/stress/regexp-max-size.js (rev 0)
+++ trunk/JSTests/stress/regexp-max-size.js 2021-02-26 23:22:51 UTC (rev 273594)
@@ -0,0 +1,63 @@
+function testMaxRegExp() {
+let patt = 'A{4294967294}X';
+const re = RegExp(patt);
+return "AAX".match(re);
+}
+
+function testTooBigRegExp() {
+let patt = 'A{4294967295}X';
+const re = RegExp(patt);
+return "AAX".match(re);
+}
+
+function testMaxBMPRegExp() {
+let patt = '\u{1234}{4294967294}X';
+const re = RegExp(patt, 'u');
+return "\u{1234}\u{1234}X".match(re);
+}
+
+function testTooBigBMPRegExp() {
+let patt = '\u{1234}{4294967294}\u{4567}';
+const re = RegExp(patt, 'u');
+return "\u{1234}\u{1234}\u{4567}".match(re);
+}
+
+function testMaxNonBMPRegExp() {
+let patt = '\u{10234}{2147483646}\u{10100}';
+const re = RegExp(patt, 'u');
+return "\u{10234}\u{10234}\u{10100}".match(re);
+}
+
+function testTooBigNonBMPRegExp() {
+let patt = '\u{10234}{2147483646}\u{10100}';
+const re = RegExp(patt, 'u');
+return "\u{10234}\u{10234}\u{10100}".match(re);
+}
+
+let shouldCompile = [testMaxRegExp, testMaxRegExp, testMaxRegExp];
+let shouldntCompile = [testTooBigRegExp, testTooBigRegExp, testTooBigRegExp];
+
+function testAll()
+{
+for (let i = 0; i < shouldCompile.length; ++i) {
+if (shouldCompile[i]())
+throw "This RegExp: " + shouldCompile[i] + " should compile and fail to match";
+}
+
+for (let i = 0; i < shouldntCompile.length; ++i) {
+let notSyntaxError = false;
+
+try {
+shouldntCompile[i]();
+notSyntaxError = true;
+} catch(e) {
+if (!(e instanceof SyntaxError))
+notSyntaxError = true;
+}
+
+if (notSyntaxError)
+throw "This RegExp: " + shouldntCompile + " should throw a Syntax Error when it is compiled";
+}
+}
+
+testAll();
Modified: trunk/Source/_javascript_Core/ChangeLog (273593 => 273594)
--- trunk/Source/_javascript_Core/ChangeLog 2021-02-26 23:20:31 UTC (rev 273593)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-02-26 23:22:51 UTC (rev 273594)
@@ -1,3 +1,23 @@
+2021-02-26 Michael Saboff
+
+unexpected minimumInputSize in setupDisjunctionOffsets for regexp engine(yarr)
+https://bugs.webkit.org/show_bug.cgi?id=220357
+
+Reviewed by Saam Barati.
+
+Removed an unnecessary ASSERT.
+This assert checked that the minimum size wasn't UINT_MAX which I believe was
+intended to make sure the minimum size was changed while computing the
+disjunction's size and offsets. Those calculations involve checked arithmetic,
+which would catch any overflow.
+
+The other
[webkit-changes] [273518] trunk/JSTests
Title: [273518] trunk/JSTests Revision 273518 Author msab...@apple.com Date 2021-02-25 15:45:19 -0800 (Thu, 25 Feb 2021) Log Message [test262] test/built-ins/RegExp/match-indices needs updating for 'd' flag https://bugs.webkit.org/show_bug.cgi?id=222142 Reviewed by Yusuke Suzuki. Updated WebKit's copy of Test262 to the latest. All of the changes are related to the RegExp match indices stage 3 proposal (https://github.com/tc39/proposal-regexp-match-indices). Removed the local copies of the built-ins/RegExp/match-indices/ tests now that they have been merged. Enabled the testing of the "regexp-match-indices" feature in config.yaml as we pass all of the associated tests. * stress/test262-indices-array-element.js: Removed. * stress/test262-indices-array-matched.js: Removed. * stress/test262-indices-array-non-unicode-match.js: Removed. * stress/test262-indices-array-properties.js: Removed. * stress/test262-indices-array-unicode-match.js: Removed. * stress/test262-indices-array-unicode-property-names.js: Removed. * stress/test262-indices-array-unmatched.js: Removed. * stress/test262-indices-array.js: Removed. * stress/test262-indices-groups-object-undefined.js: Removed. * stress/test262-indices-groups-object-unmatched.js: Removed. * stress/test262-indices-groups-object.js: Removed. * stress/test262-indices-groups-properties.js: Removed. * stress/test262-indices-property.js: Removed. * test262/config.yaml: * test262/test/built-ins/RegExp/duplicate-flags.js: * test262/test/built-ins/RegExp/match-indices/indices-array-element.js: * test262/test/built-ins/RegExp/match-indices/indices-array-matched.js: * test262/test/built-ins/RegExp/match-indices/indices-array-non-unicode-match.js: * test262/test/built-ins/RegExp/match-indices/indices-array-properties.js: * test262/test/built-ins/RegExp/match-indices/indices-array-unicode-match.js: * test262/test/built-ins/RegExp/match-indices/indices-array-unicode-property-names.js: * test262/test/built-ins/RegExp/match-indices/indices-array-unmatched.js: * test262/test/built-ins/RegExp/match-indices/indices-array.js: * test262/test/built-ins/RegExp/match-indices/indices-groups-object-undefined.js: * test262/test/built-ins/RegExp/match-indices/indices-groups-object-unmatched.js: * test262/test/built-ins/RegExp/match-indices/indices-groups-object.js: * test262/test/built-ins/RegExp/match-indices/indices-groups-properties.js: * test262/test/built-ins/RegExp/match-indices/indices-property.js: * test262/test/built-ins/RegExp/match-indices/no-indices-array.js: Added. * test262/test/built-ins/RegExp/prototype/flags/coercion-hasIndices.js: Added. (get Object): (assert.sameValue.get call): * test262/test/built-ins/RegExp/prototype/flags/get-order.js: (re.get hasIndices): * test262/test/built-ins/RegExp/prototype/flags/rethrow.js: (get Object): * test262/test/built-ins/RegExp/prototype/flags/return-order.js: * test262/test/built-ins/RegExp/prototype/flags/this-val-regexp.js: * test262/test/built-ins/RegExp/prototype/hasIndices: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/cross-realm.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/length.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/name.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/prop-desc.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/this-val-invalid-obj.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/this-val-non-obj.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/this-val-regexp-prototype.js: Added. * test262/test/built-ins/RegExp/prototype/hasIndices/this-val-regexp.js: Added. Modified Paths trunk/JSTests/ChangeLog trunk/JSTests/test262/config.yaml trunk/JSTests/test262/test/built-ins/RegExp/duplicate-flags.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-element.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-matched.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-non-unicode-match.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-properties.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-unicode-match.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-unicode-property-names.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array-unmatched.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-array.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-groups-object-undefined.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-groups-object-unmatched.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-groups-object.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-groups-properties.js trunk/JSTests/test262/test/built-ins/RegExp/match-indices/indices-property.js trunk/JSTests/test262/test/built-ins/RegExp/prototype/flags/get-order.js
[webkit-changes] [273371] trunk
Title: [273371] trunk
Revision 273371
Author msab...@apple.com
Date 2021-02-23 21:00:30 -0800 (Tue, 23 Feb 2021)
Log Message
[YARR JIT] Crash on overflow when compiling /(a{10}b{10}|c{10}|)d{10}e{10}/.test();
https://bugs.webkit.org/show_bug.cgi?id=220130
Reviewed by Yusuke Suzuki.
JSTests:
Modified the original fuzzer test to go 2^32-1.
* stress/regexp-backtrack-offset-overflow.js: Added.
Source/_javascript_Core:
Changed code to subtract out the offset of a current op before adding the offset
of the prior op when backtracking to avoid overflowing checked arithmetic.
It looks like the code had this wrong for some time.
* yarr/YarrJIT.cpp:
Modified Paths
trunk/JSTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/yarr/YarrJIT.cpp
Added Paths
trunk/JSTests/stress/regexp-backtrack-offset-overflow.js
Diff
Modified: trunk/JSTests/ChangeLog (273370 => 273371)
--- trunk/JSTests/ChangeLog 2021-02-24 04:03:18 UTC (rev 273370)
+++ trunk/JSTests/ChangeLog 2021-02-24 05:00:30 UTC (rev 273371)
@@ -1,3 +1,14 @@
+2021-02-23 Michael Saboff
+
+[YARR JIT] Crash on overflow when compiling /(a{10}b{10}|c{10}|)d{10}e{10}/.test();
+https://bugs.webkit.org/show_bug.cgi?id=220130
+
+Reviewed by Yusuke Suzuki.
+
+Modified the original fuzzer test to go 2^32-1.
+
+* stress/regexp-backtrack-offset-overflow.js: Added.
+
2021-02-21 Keith Miller
Implement the Top-level await proposal
Added: trunk/JSTests/stress/regexp-backtrack-offset-overflow.js (0 => 273371)
--- trunk/JSTests/stress/regexp-backtrack-offset-overflow.js (rev 0)
+++ trunk/JSTests/stress/regexp-backtrack-offset-overflow.js 2021-02-24 05:00:30 UTC (rev 273371)
@@ -0,0 +1,3 @@
+//@ runDefault
+
+/(a{10}b{10}|c{10}|)d{1094967295}e{10}/.test("abc");
Modified: trunk/Source/_javascript_Core/ChangeLog (273370 => 273371)
--- trunk/Source/_javascript_Core/ChangeLog 2021-02-24 04:03:18 UTC (rev 273370)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-02-24 05:00:30 UTC (rev 273371)
@@ -1,3 +1,16 @@
+2021-02-23 Michael Saboff
+
+[YARR JIT] Crash on overflow when compiling /(a{10}b{10}|c{10}|)d{10}e{10}/.test();
+https://bugs.webkit.org/show_bug.cgi?id=220130
+
+Reviewed by Yusuke Suzuki.
+
+Changed code to subtract out the offset of a current op before adding the offset
+of the prior op when backtracking to avoid overflowing checked arithmetic.
+It looks like the code had this wrong for some time.
+
+* yarr/YarrJIT.cpp:
+
2021-02-22 Don Olmstead
Non-unified build fixes late February 2021 edition
Modified: trunk/Source/_javascript_Core/yarr/YarrJIT.cpp (273370 => 273371)
--- trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2021-02-24 04:03:18 UTC (rev 273370)
+++ trunk/Source/_javascript_Core/yarr/YarrJIT.cpp 2021-02-24 05:00:30 UTC (rev 273371)
@@ -2795,11 +2795,11 @@
case OpBodyAlternativeNext: {
PatternAlternative* alternative = op.m_alternative;
+m_checkedOffset -= alternative->m_minimumSize;
if (op.m_op == OpBodyAlternativeNext) {
PatternAlternative* priorAlternative = m_ops[op.m_previousOp].m_alternative;
m_checkedOffset += priorAlternative->m_minimumSize;
}
-m_checkedOffset -= alternative->m_minimumSize;
// Is this the last alternative? If not, then if we backtrack to this point we just
// need to jump to try to match the next alternative.
@@ -3101,11 +3101,11 @@
m_backtrackingState.append(endOp->m_jumps);
}
+m_checkedOffset -= op.m_checkAdjust;
if (!isBegin) {
YarrOp& lastOp = m_ops[op.m_previousOp];
m_checkedOffset += lastOp.m_checkAdjust;
}
-m_checkedOffset -= op.m_checkAdjust;
break;
}
case OpSimpleNestedAlternativeEnd:
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [273160] trunk
Title: [273160] trunk Revision 273160 Author msab...@apple.com Date 2021-02-19 12:50:48 -0800 (Fri, 19 Feb 2021) Log Message Minor fixes to RegExp match indices after r273086 https://bugs.webkit.org/show_bug.cgi?id=222157 Reviewed by Yusuke Suzuki. JSTests: Added a new test to verify that all flag RegExp flag combinations work round tripping from flags to flag proerties and back. Added standalone versions of the updated regexp-match-indices from the PR https://github.com/tc39/test262/pull/2934 as JSTest/stress test. Disabled the regexp-match-indices feature test in test262 until the pull request with updated tests land and we update the WebKit version. This is tracked in https://bugs.webkit.org/show_bug.cgi?id=222142. * stress/regexp-all-flags.js: Added. (flagsFromVariation): (setPropertiesForVariation): (missingPropertiesForVariation): (test.let.flagsSet.get call): (test): * stress/test262-indices-array-element.js: Added. (assertSameValue): * stress/test262-indices-array-matched.js: Added. (assertSameValue): (assertCompareArray): * stress/test262-indices-array-non-unicode-match.js: Added. (assertSameValue): (assertCompareArray): (assertDeepEqual): (verifyProperty): * stress/test262-indices-array-properties.js: Added. (verifyProperty): * stress/test262-indices-array-unicode-match.js: Added. (assertSameValue): (assertCompareArray): (assertDeepEqual): (verifyProperty): * stress/test262-indices-array-unicode-property-names.js: Added. (assertCompareArray): * stress/test262-indices-array-unmatched.js: Added. (assertSameValue): * stress/test262-indices-array.js: Added. (assert): (assertSameValue): * stress/test262-indices-groups-object-undefined.js: Added. (verifyProperty): * stress/test262-indices-groups-object-unmatched.js: Added. (assertSameValue): (assertCompareArray): * stress/test262-indices-groups-object.js: Added. (assertSameValue): (assertCompareArray): (verifyProperty): * stress/test262-indices-groups-properties.js: Added. (assertCompareArray): (verifyProperty): * stress/test262-indices-property.js: Added. (assertSameValue): (verifyProperty): * test262/config.yaml: Source/_javascript_Core: When hasIndices is true, but there aren't any named groups, the spec says that we should create the indices.groups property is the value undefined. Increased the size of FlagsString to 7 plus terminater to account for the new 'd' flags. * runtime/RegExpMatchesArray.h: (JSC::createRegExpMatchesArray): * runtime/RegExpPrototype.cpp: Modified Paths trunk/JSTests/ChangeLog trunk/JSTests/test262/config.yaml trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h trunk/Source/_javascript_Core/runtime/RegExpPrototype.cpp Added Paths trunk/JSTests/stress/regexp-all-flags.js trunk/JSTests/stress/test262-indices-array-element.js trunk/JSTests/stress/test262-indices-array-matched.js trunk/JSTests/stress/test262-indices-array-non-unicode-match.js trunk/JSTests/stress/test262-indices-array-properties.js trunk/JSTests/stress/test262-indices-array-unicode-match.js trunk/JSTests/stress/test262-indices-array-unicode-property-names.js trunk/JSTests/stress/test262-indices-array-unmatched.js trunk/JSTests/stress/test262-indices-array.js trunk/JSTests/stress/test262-indices-groups-object-undefined.js trunk/JSTests/stress/test262-indices-groups-object-unmatched.js trunk/JSTests/stress/test262-indices-groups-object.js trunk/JSTests/stress/test262-indices-groups-properties.js trunk/JSTests/stress/test262-indices-property.js Diff Modified: trunk/JSTests/ChangeLog (273159 => 273160) --- trunk/JSTests/ChangeLog 2021-02-19 20:47:53 UTC (rev 273159) +++ trunk/JSTests/ChangeLog 2021-02-19 20:50:48 UTC (rev 273160) @@ -1,3 +1,65 @@ +2021-02-19 Michael Saboff + +Minor fixes to RegExp match indices after r273086 +https://bugs.webkit.org/show_bug.cgi?id=222157 + +Reviewed by Yusuke Suzuki. + +Added a new test to verify that all flag RegExp flag combinations work round tripping +from flags to flag proerties and back. +Added standalone versions of the updated regexp-match-indices from the PR +https://github.com/tc39/test262/pull/2934 as JSTest/stress test. +Disabled the regexp-match-indices feature test in test262 until the pull request +with updated tests land and we update the WebKit version. +This is tracked in https://bugs.webkit.org/show_bug.cgi?id=222142. + +* stress/regexp-all-flags.js: Added. +(flagsFromVariation): +(setPropertiesForVariation): +(missingPropertiesForVariation): +(test.let.flagsSet.get call): +(test): +* stress/test262-indices-array-element.js: Added. +(assertSameValue): +* stress/test262-indices-array-matched.js: Added. +(assertSameValue): +(assertCompareArray): +* stress/test262-indices-array-non-unicode-match.js: Added. +(assertSameValue): +(assertCompareArray): +
[webkit-changes] [273086] trunk
Title: [273086] trunk
Revision 273086
Author msab...@apple.com
Date 2021-02-18 11:14:34 -0800 (Thu, 18 Feb 2021)
Log Message
[JSC] Implement RegExp Match Indices proposal
https://bugs.webkit.org/show_bug.cgi?id=202475
Reviewed by Yusuke Suzuki.
JSTests:
Updated tests.
* es6/Proxy_internal_get_calls_RegExp.prototype.flags.js:
* stress/static-getter-in-names.js:
* test262/config.yaml:
Source/_javascript_Core:
This implements the latest version of the RegExp match indices proposal (https://github.com/tc39/proposal-regexp-match-indices).
It includes a new 'd' flag to RegExp's to trigger the population of the 'indices' property tree in a Matches result from
RegExp.exec() and related methods. This change is performance neutral on JetStream2.
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter::executeEffects):
* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):
* runtime/CommonIdentifiers.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
(JSC::JSGlobalObject::fireWatchpointAndMakeAllArrayStructuresSlowPut):
(JSC::JSGlobalObject::visitChildren):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::regExpMatchesArrayWithIndicesStructure const):
(JSC::JSGlobalObject::regExpMatchesIndicesArrayStructure const):
* runtime/RegExp.cpp:
(JSC::RegExpFunctionalTestCollector::outputOneTest):
(JSC::regexpToSourceString):
* runtime/RegExp.h:
* runtime/RegExpMatchesArray.cpp:
(JSC::createEmptyRegExpMatchesArray):
(JSC::createStructureWithIndicesImpl):
(JSC::createIndicesStructureImpl):
(JSC::createRegExpMatchesArrayWithIndicesStructure):
(JSC::createRegExpMatchesIndicesArrayStructure):
(JSC::createRegExpMatchesArrayWithIndicesSlowPutStructure):
(JSC::createRegExpMatchesIndicesArraySlowPutStructure):
* runtime/RegExpMatchesArray.h:
(JSC::createRegExpMatchesArray):
* runtime/RegExpPrototype.cpp:
(JSC::RegExpPrototype::finishCreation):
(JSC::flagsString):
(JSC::JSC_DEFINE_HOST_FUNCTION):
* yarr/YarrFlags.cpp:
(JSC::Yarr::parseFlags):
* yarr/YarrFlags.h:
* yarr/YarrInterpreter.h:
(JSC::Yarr::BytecodePattern::hasIndices const):
* yarr/YarrPattern.h:
(JSC::Yarr::YarrPattern::hasIndices const):
LayoutTests:
Updated tests.
* js/Object-getOwnPropertyNames-expected.txt:
* js/regexp-named-capture-groups-expected.txt:
* js/script-tests/Object-getOwnPropertyNames.js:
* js/script-tests/regexp-named-capture-groups.js:
Modified Paths
trunk/JSTests/ChangeLog
trunk/JSTests/es6/Proxy_internal_get_calls_RegExp.prototype.flags.js
trunk/JSTests/stress/static-getter-in-names.js
trunk/JSTests/test262/config.yaml
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt
trunk/LayoutTests/js/regexp-named-capture-groups-expected.txt
trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js
trunk/LayoutTests/js/script-tests/regexp-named-capture-groups.js
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h
trunk/Source/_javascript_Core/dfg/DFGStrengthReductionPhase.cpp
trunk/Source/_javascript_Core/runtime/CommonIdentifiers.h
trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp
trunk/Source/_javascript_Core/runtime/JSGlobalObject.h
trunk/Source/_javascript_Core/runtime/RegExp.cpp
trunk/Source/_javascript_Core/runtime/RegExp.h
trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.cpp
trunk/Source/_javascript_Core/runtime/RegExpMatchesArray.h
trunk/Source/_javascript_Core/runtime/RegExpPrototype.cpp
trunk/Source/_javascript_Core/yarr/YarrFlags.cpp
trunk/Source/_javascript_Core/yarr/YarrFlags.h
trunk/Source/_javascript_Core/yarr/YarrInterpreter.h
trunk/Source/_javascript_Core/yarr/YarrPattern.h
Diff
Modified: trunk/JSTests/ChangeLog (273085 => 273086)
--- trunk/JSTests/ChangeLog 2021-02-18 19:12:45 UTC (rev 273085)
+++ trunk/JSTests/ChangeLog 2021-02-18 19:14:34 UTC (rev 273086)
@@ -1,3 +1,16 @@
+2021-02-18 Michael Saboff
+
+[JSC] Implement RegExp Match Indices proposal
+https://bugs.webkit.org/show_bug.cgi?id=202475
+
+Reviewed by Yusuke Suzuki.
+
+Updated tests.
+
+* es6/Proxy_internal_get_calls_RegExp.prototype.flags.js:
+* stress/static-getter-in-names.js:
+* test262/config.yaml:
+
2021-02-16 Yusuke Suzuki and Sergey Rubanov
WebAssembly: implement non-trapping float to int conversion
Modified: trunk/JSTests/es6/Proxy_internal_get_calls_RegExp.prototype.flags.js (273085 => 273086)
--- trunk/JSTests/es6/Proxy_internal_get_calls_RegExp.prototype.flags.js 2021-02-18 19:12:45 UTC (rev 273085)
+++ trunk/JSTests/es6/Proxy_internal_get_calls_RegExp.prototype.flags.js 2021-02-18 19:14:34 UTC (rev 273086)
@@ -4,7 +4,7 @@
var get = [];
var p = new Proxy({}, { get: function(o, k) { get.push(k); return o[k]; }});
Object.getOwnPropertyDescriptor(RegExp.prototype, 'flags').get.call(p);
-return get + '' === "global,ignoreCase,multiline,dotAll,unicode,sticky";
+return get + '' ===
[webkit-changes] [272892] trunk/Source
Title: [272892] trunk/Source
Revision 272892
Author msab...@apple.com
Date 2021-02-15 17:51:50 -0800 (Mon, 15 Feb 2021)
Log Message
[ARM64] Change break instruction comment to indicate possible security failure
https://bugs.webkit.org/show_bug.cgi?id=221936
Reviewed by Mark Lam.
Source/bmalloc:
Change the ASSERT break comment immediate to the same value the C++ compiler uses.
* bmalloc/BAssert.h:
Source/_javascript_Core:
We change the comment value to indicate a possible security issue by
using the same value the C++ compiler emits.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::breakpoint):
* disassembler/ARM64/A64DOpcode.cpp:
(JSC::ARM64Disassembler::A64OpcodeExceptionGeneration::format):
* disassembler/ARM64/A64DOpcode.h:
(JSC::ARM64Disassembler::A64OpcodeExceptionGeneration::immediate16):
* offlineasm/arm64.rb:
Source/WTF:
Change the ASSERT break comment immediate to the same value the C++ compiler uses.
* wtf/Assertions.cpp:
* wtf/Assertions.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h
trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.cpp
trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.h
trunk/Source/_javascript_Core/offlineasm/arm64.rb
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Assertions.cpp
trunk/Source/WTF/wtf/Assertions.h
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc/BAssert.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (272891 => 272892)
--- trunk/Source/_javascript_Core/ChangeLog 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-02-16 01:51:50 UTC (rev 272892)
@@ -1,3 +1,21 @@
+2021-02-15 Michael Saboff
+
+[ARM64] Change break instruction comment to indicate possible security failure
+https://bugs.webkit.org/show_bug.cgi?id=221936
+
+Reviewed by Mark Lam.
+
+We change the comment value to indicate a possible security issue by
+using the same value the C++ compiler emits.
+
+* assembler/MacroAssemblerARM64.h:
+(JSC::MacroAssemblerARM64::breakpoint):
+* disassembler/ARM64/A64DOpcode.cpp:
+(JSC::ARM64Disassembler::A64OpcodeExceptionGeneration::format):
+* disassembler/ARM64/A64DOpcode.h:
+(JSC::ARM64Disassembler::A64OpcodeExceptionGeneration::immediate16):
+* offlineasm/arm64.rb:
+
2021-02-15 Timothy Hatcher
Web Inspector: Add a way to wake up debuggables to the remote inspector protocol
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (272891 => 272892)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2021-02-16 01:51:50 UTC (rev 272892)
@@ -3695,7 +3695,7 @@
// Miscellaneous operations:
-void breakpoint(uint16_t imm = 0)
+void breakpoint(uint16_t imm = 0xc471)
{
m_assembler.brk(imm);
}
Modified: trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.cpp (272891 => 272892)
--- trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.cpp 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.cpp 2021-02-16 01:51:50 UTC (rev 272892)
@@ -630,7 +630,7 @@
return A64DOpcode::format();
appendInstructionName(opname);
-appendUnsignedImmediate(immediate16());
+appendUnsignedHexImmediate(immediate16());
return m_formatBuffer;
}
Modified: trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.h (272891 => 272892)
--- trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.h 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/_javascript_Core/disassembler/ARM64/A64DOpcode.h 2021-02-16 01:51:50 UTC (rev 272892)
@@ -409,7 +409,7 @@
unsigned opc() { return (m_opcode>>21) & 0x7; }
unsigned op2() { return (m_opcode>>2) & 0x7; }
unsigned ll() { return m_opcode & 0x3; }
-int immediate16() { return (static_cast((m_opcode >> 5) & 0x) << 16) >> 16; }
+unsigned immediate16() { return (static_cast((m_opcode >> 5) & 0x) << 16) >> 16; }
};
class A64DOpcodeExtract : public A64DOpcode {
Modified: trunk/Source/_javascript_Core/offlineasm/arm64.rb (272891 => 272892)
--- trunk/Source/_javascript_Core/offlineasm/arm64.rb 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/_javascript_Core/offlineasm/arm64.rb 2021-02-16 01:51:50 UTC (rev 272892)
@@ -1016,7 +1016,7 @@
emitARM64Unflipped("blr", operands, :quad)
end
when "break"
-$asm.puts "brk \#0"
+$asm.puts "brk \#0xc471"
when "ret"
$asm.puts "ret"
when "cieq", "cbeq"
Modified: trunk/Source/WTF/ChangeLog (272891 => 272892)
--- trunk/Source/WTF/ChangeLog 2021-02-16 00:27:11 UTC (rev 272891)
+++ trunk/Source/WTF/ChangeLog 2021-02-16 01:51:50 UTC (rev
[webkit-changes] [272886] trunk/Source/WTF
Title: [272886] trunk/Source/WTF
Revision 272886
Author msab...@apple.com
Date 2021-02-15 15:29:43 -0800 (Mon, 15 Feb 2021)
Log Message
REGRESSION r272823): Crash in ARM64e Wasm tests
https://bugs.webkit.org/show_bug.cgi?id=221922
Reviewed by Mark Lam.
Updated to properly compute the size of thread_state_t as well as the offset of
the PC found in thread_state_t.
* wtf/threads/Signals.cpp:
(WTF::hashThreadState):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/threads/Signals.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (272885 => 272886)
--- trunk/Source/WTF/ChangeLog 2021-02-15 23:08:52 UTC (rev 272885)
+++ trunk/Source/WTF/ChangeLog 2021-02-15 23:29:43 UTC (rev 272886)
@@ -1,3 +1,16 @@
+2021-02-15 Michael Saboff
+
+REGRESSION r272823): Crash in ARM64e Wasm tests
+https://bugs.webkit.org/show_bug.cgi?id=221922
+
+Reviewed by Mark Lam.
+
+Updated to properly compute the size of thread_state_t as well as the offset of
+the PC found in thread_state_t.
+
+* wtf/threads/Signals.cpp:
+(WTF::hashThreadState):
+
2021-02-15 Commit Queue
Unreviewed, reverting r272831.
Modified: trunk/Source/WTF/wtf/threads/Signals.cpp (272885 => 272886)
--- trunk/Source/WTF/wtf/threads/Signals.cpp 2021-02-15 23:08:52 UTC (rev 272885)
+++ trunk/Source/WTF/wtf/threads/Signals.cpp 2021-02-15 23:29:43 UTC (rev 272886)
@@ -158,8 +158,8 @@
#if CPU(ARM64E) && OS(DARWIN)
inline ptrauth_generic_signature_t hashThreadState(const thread_state_t source)
{
-constexpr size_t threadStatePCPointerIndex = offsetof(arm_thread_state64_t, __opaque_pc) / sizeof(uintptr_t);
-constexpr size_t threadStateSizeInPointers = sizeof(arm_thread_state64_t) / sizeof(uintptr_t);
+constexpr size_t threadStatePCPointerIndex = (offsetof(arm_unified_thread_state, ts_64) + offsetof(arm_thread_state64_t, __opaque_pc)) / sizeof(uintptr_t);
+constexpr size_t threadStateSizeInPointers = sizeof(arm_unified_thread_state) / sizeof(uintptr_t);
ptrauth_generic_signature_t hash = 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [272850] trunk
Title: [272850] trunk Revision 272850 Author msab...@apple.com Date 2021-02-15 08:51:33 -0800 (Mon, 15 Feb 2021) Log Message Unreviewed cleanup after r272824. * Restored stepped on Tools/ChangeLog entries. * Eliminated unneeded empty directory. Modified Paths trunk/Tools/ChangeLog Removed Paths trunk/Source/_javascript_Core/signal/ Diff Modified: trunk/Tools/ChangeLog (272849 => 272850) --- trunk/Tools/ChangeLog 2021-02-15 12:56:32 UTC (rev 272849) +++ trunk/Tools/ChangeLog 2021-02-15 16:51:33 UTC (rev 272850) @@ -48,6 +48,77 @@ * TestWebKitAPI/Tests/WTF/Signals.cpp: (TEST): +2021-02-12 Don Olmstead + +[Python-3] Use pathlib to generate file:// urls +https://bugs.webkit.org/show_bug.cgi?id=221850 + +Reviewed by Jonathan Bedard. + +Use pathlib which can generate file:// urls for *nix and Windows. The previous logic +only worked on *nix. + +Add the pathlib backport for 2.7. + +* Scripts/webkitpy/__init__.py: +* Scripts/webkitpy/common/checkout/scm/scm_unittest.py: +(SVNTestRepository.setup): +(SVNTestRepository._setup_mock_repo): + +2021-02-12 Don Olmstead + +[Python-3] base64.encodestring is deprecated +https://bugs.webkit.org/show_bug.cgi?id=221842 + +Reviewed by Jonathan Bedard. + +In Python 3.9 base64.encodestring was completely removed. Replacing with base64.b64encode +which works in Python 2/3 and is used by the code being tested. + +* Scripts/webkitpy/w3c/wpt_github_unittest.py: +(WPTGitHubTest.test_auth_token): + +2021-02-12 Don Olmstead + +Run additional webkitpy tests on Windows by default +https://bugs.webkit.org/show_bug.cgi?id=221851 + +Reviewed by Jonathan Bedard. + +The tests in WebKit/Scripts and webkitpy.common.config pass on Windows. + +The WebKit/Scripts tests are not run when using Cygwin. Without any port option its +the only way to differentiate WinCairo, which doesn't use Cygwin, and AppleWin, which +does. + +* Scripts/webkitpy/test/main.py: + +2021-02-12 Ryan Haddad + +REGRESSION (r268421): TestWebKitAPI.WebKit.PreferenceChanges* tests are flaky failures +https://bugs.webkit.org/show_bug.cgi?id=221848 + +Unreviewed test gardening. + +TestWebKitAPI.WebKit.GlobalPreferenceChangesUsingDefaultsWrite is also flaky, so disable it for Big Sur. + +* TestWebKitAPI/Tests/WebKit/PreferenceChanges.mm: + +2021-02-12 Don Olmstead + +webkitpy.xcode only relevant for darwin platforms +https://bugs.webkit.org/show_bug.cgi?id=221837 + +Reviewed by Jonathan Bedard. + +The tests in webkitpy.xcode are Darwin specific and should only run on that platform. + +This issue was discovered when running the tests with Python 3 on Windows which failed +a number of tests in the suite. These tests may run successfully on *nix platforms but +aren't actually relevant. + +* Scripts/webkitpy/test/main.py: + 2021-02-12 Jonathan Bedard [webkit-patch] Post both revision and identifier to bugzilla ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [272823] trunk
Title: [272823] trunk Revision 272823 Author msab...@apple.com Date 2021-02-12 16:32:01 -0800 (Fri, 12 Feb 2021) Log Message [ARM64e] Harden Mach exception handling https://bugs.webkit.org/show_bug.cgi?id=221841 Reviewed by Geoffrey Garen. Source/_javascript_Core: Split wasm_throw_from_fault_handler_trampoline into two trampolines to eliminate the need to pass a register argument to signify if we are using FastTLS. With this change we don't need to modify registers besides the PC when handling exceptions. Added sanity checks to make sure handlers are being called for the exceptions they were registered for. * bytecode/BytecodeList.rb: * llint/WebAssembly.asm: * runtime/VMTraps.cpp: * signal: Added. * tools/SigillCrashAnalyzer.cpp: (JSC::installCrashHandler): * wasm/WasmFaultSignalHandler.cpp: (JSC::Wasm::trapHandler): Source/WTF: For Darwin ARM64e platforms, we check to make sure that all thread state besides the PC hasn't been modified by an exception handler. * wtf/threads/Signals.cpp: (WTF::hashThreadState): Tools: Updated test to check that the exception type matches the one we registered for. * TestWebKitAPI/Tests/WTF/Signals.cpp: (TEST): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecode/BytecodeList.rb trunk/Source/_javascript_Core/llint/WebAssembly.asm trunk/Source/_javascript_Core/runtime/VMTraps.cpp trunk/Source/_javascript_Core/tools/SigillCrashAnalyzer.cpp trunk/Source/_javascript_Core/wasm/WasmFaultSignalHandler.cpp trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/threads/Signals.cpp trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WTF/Signals.cpp Added Paths trunk/Source/_javascript_Core/signal/ Diff Modified: trunk/Source/_javascript_Core/ChangeLog (272822 => 272823) --- trunk/Source/_javascript_Core/ChangeLog 2021-02-13 00:29:35 UTC (rev 272822) +++ trunk/Source/_javascript_Core/ChangeLog 2021-02-13 00:32:01 UTC (rev 272823) @@ -1,3 +1,25 @@ +2021-02-12 Michael Saboff + +[ARM64e] Harden Mach exception handling +https://bugs.webkit.org/show_bug.cgi?id=221841 + +Reviewed by Geoffrey Garen. + +Split wasm_throw_from_fault_handler_trampoline into two trampolines to eliminate the +need to pass a register argument to signify if we are using FastTLS. With this change +we don't need to modify registers besides the PC when handling exceptions. +Added sanity checks to make sure handlers are being called for the exceptions they +were registered for. + +* bytecode/BytecodeList.rb: +* llint/WebAssembly.asm: +* runtime/VMTraps.cpp: +* signal: Added. +* tools/SigillCrashAnalyzer.cpp: +(JSC::installCrashHandler): +* wasm/WasmFaultSignalHandler.cpp: +(JSC::Wasm::trapHandler): + 2021-02-12 Mark Lam Move RootMarkReason out of SlotVisitor. Modified: trunk/Source/_javascript_Core/bytecode/BytecodeList.rb (272822 => 272823) --- trunk/Source/_javascript_Core/bytecode/BytecodeList.rb 2021-02-13 00:29:35 UTC (rev 272822) +++ trunk/Source/_javascript_Core/bytecode/BytecodeList.rb 2021-02-13 00:32:01 UTC (rev 272823) @@ -1489,7 +1489,8 @@ # Helpers op :throw_from_slow_path_trampoline -op :throw_from_fault_handler_trampoline +op :throw_from_fault_handler_trampoline_fastTLS +op :throw_from_fault_handler_trampoline_reg_instance op :call_return_location op :call_no_tls_return_location Modified: trunk/Source/_javascript_Core/llint/WebAssembly.asm (272822 => 272823) --- trunk/Source/_javascript_Core/llint/WebAssembly.asm 2021-02-13 00:29:35 UTC (rev 272822) +++ trunk/Source/_javascript_Core/llint/WebAssembly.asm 2021-02-13 00:32:01 UTC (rev 272823) @@ -533,17 +533,13 @@ end end) -op(wasm_throw_from_fault_handler_trampoline, macro () -move wasmInstance, a2 -btqz a1, .instanceReady # a1 is non-zero if FastTLS is enabled. -loadWasmInstanceFromTLSTo(a2) -.instanceReady: -loadp Wasm::Instance::m_pointerToTopEntryFrame[a2], a0 +macro wasm_throw_from_fault_handler(instance) +# instance should be in a2 when we get here +loadp Wasm::Instance::m_pointerToTopEntryFrame[instance], a0 loadp [a0], a0 copyCalleeSavesToEntryFrameCalleeSavesBuffer(a0) move constexpr Wasm::ExceptionType::OutOfBoundsMemoryAccess, a3 -# a2 is Wasm::Instance move 0, a1 move cfr, a0 cCall4(_slow_path_wasm_throw_exception) @@ -555,8 +551,18 @@ else jmp r0, ExceptionHandlerPtrTag end +end + +op(wasm_throw_from_fault_handler_trampoline_fastTLS, macro () +loadWasmInstanceFromTLSTo(a2) +wasm_throw_from_fault_handler(a2) end) +op(wasm_throw_from_fault_handler_trampoline_reg_instance, macro () +move wasmInstance, a2 +wasm_throw_from_fault_handler(a2) +end) + # Disable wide version of narrow-only opcodes noWide(wasm_enter) noWide(wasm_wide16) Modified: trunk/Source/_javascript_Core/runtime/VMTraps.cpp (272822
[webkit-changes] [267854] trunk/LayoutTests
Title: [267854] trunk/LayoutTests
Revision 267854
Author msab...@apple.com
Date 2020-10-01 15:18:13 -0700 (Thu, 01 Oct 2020)
Log Message
[macOS/iOS WK2] storage/indexeddb/IDBKey-create-array-buffer-view-oom.html is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=216960
Reviewed by Saam Barati.
Speculative fix to stop the test from timing out.
* storage/indexeddb/IDBKey-create-array-buffer-view-oom.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html
Diff
Modified: trunk/LayoutTests/ChangeLog (267853 => 267854)
--- trunk/LayoutTests/ChangeLog 2020-10-01 21:52:59 UTC (rev 267853)
+++ trunk/LayoutTests/ChangeLog 2020-10-01 22:18:13 UTC (rev 267854)
@@ -1,3 +1,14 @@
+2020-10-01 Michael Saboff
+
+[macOS/iOS WK2] storage/indexeddb/IDBKey-create-array-buffer-view-oom.html is a flaky timeout
+https://bugs.webkit.org/show_bug.cgi?id=216960
+
+Reviewed by Saam Barati.
+
+Speculative fix to stop the test from timing out.
+
+* storage/indexeddb/IDBKey-create-array-buffer-view-oom.html:
+
2020-10-01 Lauro Moura
[GLib] Garden webaudio/Convolver/unmmodified-buffer.html flakiness
Modified: trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html (267853 => 267854)
--- trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html 2020-10-01 21:52:59 UTC (rev 267853)
+++ trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html 2020-10-01 22:18:13 UTC (rev 267854)
@@ -24,7 +24,7 @@
} catch { }
try {
-while(1)
+for (let timeoutCount = 1000; timeoutCount--;)
new ArrayBuffer(2**20);
} catch { }
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [267205] trunk
Title: [267205] trunk Revision 267205 Author msab...@apple.com Date 2020-09-17 12:52:44 -0700 (Thu, 17 Sep 2020) Log Message Segfault in WebCore::IDBKey::createBinary https://bugs.webkit.org/show_bug.cgi?id=216501 Reviewed by Youenn Fablet. Source/WebCore: If we can't get a copy of the JSBufferView, return an invalid IDBKey. This can happen if we are low on memory. The existing calling code already handles the case where we might produce an invalid IDBKey. Test: storage/indexeddb/IDBKey-create-array-buffer-view-oom.html * Modules/indexeddb/IDBKey.cpp: (WebCore::IDBKey::createBinary): LayoutTests: New test. Since this test is looking for the out of memory condition, the test is written to avoid false failures in the case we can't achieve out of memory. That is when the expected exception is not thrown. * storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt: Added. * storage/indexeddb/IDBKey-create-array-buffer-view-oom.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/indexeddb/IDBKey.cpp Added Paths trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html Diff Modified: trunk/LayoutTests/ChangeLog (267204 => 267205) --- trunk/LayoutTests/ChangeLog 2020-09-17 19:28:43 UTC (rev 267204) +++ trunk/LayoutTests/ChangeLog 2020-09-17 19:52:44 UTC (rev 267205) @@ -1,3 +1,17 @@ +2020-09-17 Michael Saboff + +Segfault in WebCore::IDBKey::createBinary +https://bugs.webkit.org/show_bug.cgi?id=216501 + +Reviewed by Youenn Fablet. + +New test. Since this test is looking for the out of memory condition, the test is written +to avoid false failures in the case we can't achieve out of memory. That is when the +expected exception is not thrown. + +* storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt: Added. +* storage/indexeddb/IDBKey-create-array-buffer-view-oom.html: Added. + 2020-09-17 Chris Dumez Regression(r267144) 4 webaudio/oscillator tests are broken Added: trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt (0 => 267205) --- trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt (rev 0) +++ trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom-expected.txt 2020-09-17 19:52:44 UTC (rev 267205) @@ -0,0 +1,11 @@ +Test IndexedDB IDBKeyRange when we are Out of Memory. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS exceptionString == undefined || exceptionString === 'DataError: Provided data is inadequate.' is true +PASS IDBKeyRange.only didn't crash +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html (0 => 267205) --- trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html (rev 0) +++ trunk/LayoutTests/storage/indexeddb/IDBKey-create-array-buffer-view-oom.html 2020-09-17 19:52:44 UTC (rev 267205) @@ -0,0 +1,49 @@ + + + + + + +