Title: [287770] trunk
Revision
287770
Author
achristen...@apple.com
Date
2022-01-07 11:24:05 -0800 (Fri, 07 Jan 2022)

Log Message

Unreviewed, reverting r287698.

Broke an internal build

Reverted changeset:

"Start using C++20"
https://bugs.webkit.org/show_bug.cgi?id=233963
https://commits.webkit.org/r287698

Modified Paths

Diff

Modified: trunk/ChangeLog (287769 => 287770)


--- trunk/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,5 +1,17 @@
 2022-01-07  Alex Christensen  <achristen...@webkit.org>
 
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
         Unreviewed, reverting r287718.
 
         Broke an internal build

Modified: trunk/Source/_javascript_Core/ChangeLog (287769 => 287770)


--- trunk/Source/_javascript_Core/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-07  Yusuke Suzuki  <ysuz...@apple.com>
 
         [JSC] Clean up StructureStubInfo

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (287769 => 287770)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -27,7 +27,7 @@
 MODULEMAP_FILE = $(SRCROOT)/_javascript_Core.modulemap;
 
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
-OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol,__ZTISt9bad_alloc -Wl,-unexported_symbol,__ZTISt9exception -Wl,-unexported_symbol,__ZTSSt9bad_alloc -Wl,-unexported_symbol,__ZTSSt9exception -Wl,-unexported_symbol,__ZdlPvS_ -Wl,-unexported_symbol,__ZnwmPv -Wl,-unexported_symbol,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE11__range_endES4
 _ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE13__range_beginES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr27__is_cpp17_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIPKcEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratordeEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iteratorppEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIA10_cPccLb1EE11__range_endEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem2
 4__is_pathable_char_arrayIA10_cPccLb1EE13__range_beginEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4pathdVERKS2_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIA10_cEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__throw_filesystem_errorIJRPKcRKNS1_4pathERKNS_10error_codeEEEEvDpOT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem14__is_separatorIcEENS_9enable_ifIXsr18__can_convert_charIT_EE5valueEbE4typeES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE15__first_or_nullES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path20__source_is_absoluteIcEEbT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path6appendIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueERS2_E4typeERKS7_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem6u8pathIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueENS1_4pathEE4typeERKS6_ -Wl,-unexporte
 d_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratorptEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iterator9incrementERNS_10error_codeE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem20__is_pathable_stringINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEvE11__range_endERKS8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem20__is_pathable_stringINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEvE13__range_beginERKS8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIDuE14__append_rangeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEPKDuSC_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIDuE15__append_sourceINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEEEvRNS5_IcNS6_IcEENS8_IcEEEERKT_;
+OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol,__ZTISt9bad_alloc -Wl,-unexported_symbol,__ZTISt9exception -Wl,-unexported_symbol,__ZTSSt9bad_alloc -Wl,-unexported_symbol,__ZTSSt9exception -Wl,-unexported_symbol,__ZdlPvS_ -Wl,-unexported_symbol,__ZnwmPv -Wl,-unexported_symbol,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE11__range_endES4_
  -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE13__range_beginES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr27__is_cpp17_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIPKcEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratordeEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iteratorppEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIA10_cPccLb1EE11__range_endEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24
 __is_pathable_char_arrayIA10_cPccLb1EE13__range_beginEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4pathdVERKS2_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIA10_cEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__throw_filesystem_errorIJRPKcRKNS1_4pathERKNS_10error_codeEEEEvDpOT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem14__is_separatorIcEENS_9enable_ifIXsr18__can_convert_charIT_EE5valueEbE4typeES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE15__first_or_nullES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path20__source_is_absoluteIcEEbT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path6appendIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueERS2_E4typeERKS7_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem6u8pathIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueENS1_4pathEE4typeERKS6_ -Wl,-unexported
 _symbol,__ZNKSt3__14__fs10filesystem18directory_iteratorptEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iterator9incrementERNS_10error_codeE;
 
 OTHER_LDFLAGS_BASE = $(OTHER_LDFLAGS_HIDE_SYMBOLS) -force_load "$(BUILT_PRODUCTS_DIR)/DerivedSources/_javascript_Core/libWTF.a";
 OTHER_LDFLAGS[sdk=embedded*] = $(inherited) $(OTHER_LDFLAGS_BASE);

Modified: trunk/Source/_javascript_Core/DerivedSources.make (287769 => 287770)


--- trunk/Source/_javascript_Core/DerivedSources.make	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/DerivedSources.make	2022-01-07 19:24:05 UTC (rev 287770)
@@ -44,7 +44,7 @@
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
 
-platform_h_compiler_command = $(CC) -std=gnu++2a -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
+platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
 
 FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
 

Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (287769 => 287770)


--- trunk/Source/_javascript_Core/heap/Heap.cpp	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp	2022-01-07 19:24:05 UTC (rev 287770)
@@ -2913,12 +2913,13 @@
     m_constraintSet->add(
         "O", "Output",
         MAKE_MARKING_CONSTRAINT_EXECUTOR_PAIR(([] (auto& visitor) {
+            using Visitor = decltype(visitor);
             Heap* heap = visitor.heap();
 
             // The `visitor2` argument is strangely named because the WinCairo port
             // gets confused  and thinks we're trying to capture the outer visitor
             // arg here. Giving it a unique name works around this issue.
-            auto callOutputConstraint = [] (auto& visitor2, HeapCell* heapCell, HeapCell::Kind) {
+            auto callOutputConstraint = [] (Visitor& visitor2, HeapCell* heapCell, HeapCell::Kind) {
                 SetRootMarkReasonScope rootScope(visitor2, RootMarkReason::Output);
                 VM& vm = visitor2.vm();
                 JSCell* cell = static_cast<JSCell*>(heapCell);
@@ -2926,7 +2927,7 @@
             };
             
             auto add = [&] (auto& set) {
-                RefPtr<SharedTask<void(decltype(visitor)&)>> task = set.template forEachMarkedCellInParallel<decltype(visitor)>(callOutputConstraint);
+                RefPtr<SharedTask<void(Visitor&)>> task = set.template forEachMarkedCellInParallel<Visitor>(callOutputConstraint);
                 visitor.addParallelConstraintTask(task);
             };
 

Modified: trunk/Source/_javascript_Core/runtime/CachedTypes.cpp (287769 => 287770)


--- trunk/Source/_javascript_Core/runtime/CachedTypes.cpp	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/runtime/CachedTypes.cpp	2022-01-07 19:24:05 UTC (rev 287770)
@@ -395,7 +395,7 @@
 
 template<typename Source>
 class CachedObject {
-    WTF_MAKE_NONCOPYABLE(CachedObject);
+    WTF_MAKE_NONCOPYABLE(CachedObject<Source>);
 
 public:
     using SourceType_ = Source;

Modified: trunk/Source/_javascript_Core/runtime/LiteralParser.h (287769 => 287770)


--- trunk/Source/_javascript_Core/runtime/LiteralParser.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/runtime/LiteralParser.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -68,7 +68,7 @@
 template <typename CharType>
 struct LiteralParserToken {
 private:
-WTF_MAKE_NONCOPYABLE(LiteralParserToken);
+WTF_MAKE_NONCOPYABLE(LiteralParserToken<CharType>);
 
 public:
     LiteralParserToken() = default;

Modified: trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake (287769 => 287770)


--- trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/_javascript_Core/shell/PlatformPlayStation.cmake	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,6 +31,6 @@
     set_source_files_properties(
         ../API/tests/CustomGlobalObjectClassTest.c
         ../API/tests/testapi.c
-        PROPERTIES COMPILE_FLAGS --std=gnu2a
+        PROPERTIES COMPILE_FLAGS --std=gnu17
     )
 endif ()

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (287769 => 287770)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -13,7 +13,7 @@
 ALWAYS_SEARCH_USER_PATHS = NO;
 
 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = NO;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/ThirdParty/ChangeLog (287769 => 287770)


--- trunk/Source/ThirdParty/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (287769 => 287770)


--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -52,7 +52,7 @@
 GCC_C_LANGUAGE_STANDARD = c99
 
 // Force C++14
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 
 // not sure why apple defaults this on, but it's pretty risky
 ALWAYS_SEARCH_USER_PATHS = NO

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (287769 => 287770)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -35,7 +35,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/system/no_unique_address.h (287769 => 287770)


--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/system/no_unique_address.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/rtc_base/system/no_unique_address.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -24,7 +24,8 @@
 // should add support for it starting from C++20. Among clang compilers,
 // clang-cl doesn't support it yet and support is unclear also when the target
 // platform is iOS.
-#if defined(__has_cpp_attribute) && __has_cpp_attribute(no_unique_address)
+#if ((defined(__clang__) && !defined(_MSC_VER) && !defined(WEBRTC_MAC)) || \
+     __cplusplus > 201703L)
 // NOLINTNEXTLINE(whitespace/braces)
 #define RTC_NO_UNIQUE_ADDRESS [[no_unique_address]]
 #else

Modified: trunk/Source/WTF/ChangeLog (287769 => 287770)


--- trunk/Source/WTF/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,5 +1,17 @@
 2022-01-07  Alex Christensen  <achristen...@webkit.org>
 
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
         Unreviewed, reverting r287718.
 
         Broke an internal build

Modified: trunk/Source/WTF/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WTF/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/WTF/wtf/DisallowCType.h (287769 => 287770)


--- trunk/Source/WTF/wtf/DisallowCType.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/wtf/DisallowCType.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -40,8 +40,8 @@
 // Also generates errors on wx on Windows, presumably because these functions
 // are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h>
 // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
-// isacii(). Additionally, regex.h uses tolower on Linux.
-#if !PLATFORM(GTK) && !PLATFORM(WPE) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__)
+// isacii(). 
+#if !(OS(DARWIN) && PLATFORM(GTK)) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__)
 
 #include <ctype.h>
 

Modified: trunk/Source/WTF/wtf/FileSystem.cpp (287769 => 287770)


--- trunk/Source/WTF/wtf/FileSystem.cpp	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/wtf/FileSystem.cpp	2022-01-07 19:24:05 UTC (rev 287770)
@@ -48,24 +48,20 @@
 #include <wtf/StdFilesystem.h>
 #endif
 
-namespace WTF::FileSystemImpl {
+namespace WTF {
 
+namespace FileSystemImpl {
+
 #if HAVE(STD_FILESYSTEM) || HAVE(STD_EXPERIMENTAL_FILESYSTEM)
 
 static std::filesystem::path toStdFileSystemPath(StringView path)
 {
-#if HAVE(MISSING_STD_FILESYSTEM_PATH_CONSTRUCTOR)
-    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     return std::filesystem::u8path(path.utf8().data());
-    ALLOW_DEPRECATED_DECLARATIONS_END
-#else
-    return { std::u8string(reinterpret_cast<const char8_t*>(path.utf8().data())) };
-#endif
 }
 
 static String fromStdFileSystemPath(const std::filesystem::path& path)
 {
-    return String::fromUTF8(reinterpret_cast<const LChar*>(path.u8string().c_str()));
+    return String::fromUTF8(path.u8string().c_str());
 }
 
 #endif // HAVE(STD_FILESYSTEM) || HAVE(STD_EXPERIMENTAL_FILESYSTEM)
@@ -833,4 +829,5 @@
 
 #endif // HAVE(STD_FILESYSTEM) || HAVE(STD_EXPERIMENTAL_FILESYSTEM)
 
-} // namespace WTF::FileSystemImpl
+} // namespace FileSystemImpl
+} // namespace WTF

Modified: trunk/Source/WTF/wtf/PlatformHave.h (287769 => 287770)


--- trunk/Source/WTF/wtf/PlatformHave.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -113,14 +113,6 @@
 #endif
 #endif
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000
-#define HAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTOR 1
-#elif COMPILER(GCC)
-#if !GCC_VERSION_AT_LEAST(9, 0, 0)
-#define HAVE_MISSING_STD_FILESYSTEM_PATH_CONSTRUCTOR 1
-#endif
-#endif
-
 /* FIXME: Remove after CMake build enabled on Darwin */
 #if OS(DARWIN)
 #define HAVE_ERRNO_H 1

Modified: trunk/Source/WTF/wtf/VectorTraits.h (287769 => 287770)


--- trunk/Source/WTF/wtf/VectorTraits.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/wtf/VectorTraits.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -56,7 +56,7 @@
     };
 
     template<typename T>
-    struct VectorTraits : VectorTraitsBase<std::is_standard_layout_v<T> && std::is_trivial_v<T>, T> { };
+    struct VectorTraits : VectorTraitsBase<std::is_pod<T>::value, T> { };
 
     struct SimpleClassVectorTraits : VectorTraitsBase<false, void>
     {

Modified: trunk/Source/WTF/wtf/text/StringOperators.h (287769 => 287770)


--- trunk/Source/WTF/wtf/text/StringOperators.h	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WTF/wtf/text/StringOperators.h	2022-01-07 19:24:05 UTC (rev 287770)
@@ -85,7 +85,7 @@
 template<typename StringType1, typename StringType2>
 class StringTypeAdapter<StringAppend<StringType1, StringType2>> {
 public:
-    StringTypeAdapter(StringAppend<StringType1, StringType2>& buffer)
+    StringTypeAdapter<StringAppend<StringType1, StringType2>>(StringAppend<StringType1, StringType2>& buffer)
         : m_buffer { buffer }
     {
     }

Modified: trunk/Source/WebCore/ChangeLog (287769 => 287770)


--- trunk/Source/WebCore/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-07  Antoine Quint  <grao...@webkit.org>
 
         Inserting a new @keyframes rule does not start animations that already used this name

Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebCore/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebCore/DerivedSources.make (287769 => 287770)


--- trunk/Source/WebCore/DerivedSources.make	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/DerivedSources.make	2022-01-07 19:24:05 UTC (rev 287770)
@@ -46,7 +46,7 @@
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
 
-platform_h_compiler_command = $(CC) -std=gnu++2a -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
+platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
 
 FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
 

Modified: trunk/Source/WebCore/PAL/ChangeLog (287769 => 287770)


--- trunk/Source/WebCore/PAL/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Add a helper function that returns the value of a std::optional<T> or constructs T if needed

Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (287769 => 287770)


--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm	2022-01-07 19:24:05 UTC (rev 287770)
@@ -315,7 +315,7 @@
         // but for an IOSurface-to-IOSurface copy, there should be no conversion.
         bitsPerComponent = 16;
         bitsPerPixel = 64;
-        bitmapInfo = static_cast<CGBitmapInfo>(kCGImageAlphaPremultipliedLast) | static_cast<CGBitmapInfo>(kCGBitmapByteOrder16Host) | static_cast<CGBitmapInfo>(kCGBitmapFloatComponents);
+        bitmapInfo = kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder16Host | kCGBitmapFloatComponents;
         break;
 #endif
     case Format::YUV422:

Modified: trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm (287769 => 287770)


--- trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm	2022-01-07 19:24:05 UTC (rev 287770)
@@ -244,7 +244,6 @@
 
 class WebThreadDelegateMessageScope {
 public:
-    IGNORE_CLANG_WARNINGS_BEGIN("deprecated-volatile")
     WebThreadDelegateMessageScope() { ++webThreadDelegateMessageScopeCount; }
     ~WebThreadDelegateMessageScope()
     {
@@ -251,7 +250,6 @@
         ASSERT(webThreadDelegateMessageScopeCount);
         --webThreadDelegateMessageScopeCount;
     }
-    IGNORE_CLANG_WARNINGS_END
 };
 
 static void SendDelegateMessage(RetainPtr<NSInvocation>&& invocation)

Modified: trunk/Source/WebGPU/ChangeLog (287769 => 287770)


--- trunk/Source/WebGPU/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebGPU/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebGPU/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/WebInspectorUI/ChangeLog (287769 => 287770)


--- trunk/Source/WebInspectorUI/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebInspectorUI/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Tim Nguyen  <n...@apple.com>
 
         Unprefix -webkit-print-color-adjust CSS property

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -16,7 +16,7 @@
 ALWAYS_SEARCH_USER_PATHS = NO;
 FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(inherited);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebKit/ChangeLog (287769 => 287770)


--- trunk/Source/WebKit/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKit/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-07  Youenn Fablet  <you...@apple.com>
 
         Use completion handlers for takeAllMessagesForPort methods

Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebKit/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -130,7 +130,7 @@
 SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO;
 
 OTHER_TAPI_FLAGS = $(OTHER_TAPI_FLAGS_$(WK_COCOA_TOUCH));
-OTHER_TAPI_FLAGS_cocoatouch = -x objective-c++ -std=gnu++2a -fno-rtti -DRELEASE_WITHOUT_OPTIMIZATIONS;
+OTHER_TAPI_FLAGS_cocoatouch = -x objective-c++ -std=gnu++1z -fno-rtti -DRELEASE_WITHOUT_OPTIMIZATIONS;
 TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
 
 // This is required to make LLVM_TARGET_TRIPLE_SUFFIX propagate into scripts.

Modified: trunk/Source/WebKit/PlatformMac.cmake (287769 => 287770)


--- trunk/Source/WebKit/PlatformMac.cmake	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKit/PlatformMac.cmake	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,4 +1,4 @@
-add_definitions("-ObjC++ -std=c++2a -D__STDC_WANT_LIB_EXT1__")
+add_definitions("-ObjC++ -std=c++17 -D__STDC_WANT_LIB_EXT1__")
 find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
 find_library(CARBON_LIBRARY Carbon)
 find_library(CORESERVICES_LIBRARY CoreServices)

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (287769 => 287770)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2022-01-07 19:24:05 UTC (rev 287770)
@@ -769,9 +769,9 @@
     return _inlineMediaPlaybackRequiresPlaysInlineAttribute;
 }
 
-- (void)_setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)requiresPlaysInlineAttribute
+- (void)_setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)requires
 {
-    _inlineMediaPlaybackRequiresPlaysInlineAttribute = requiresPlaysInlineAttribute;
+    _inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
 }
 
 - (BOOL)_allowsInlineMediaPlaybackAfterFullscreen

Modified: trunk/Source/WebKitLegacy/ChangeLog (287769 => 287770)


--- trunk/Source/WebKitLegacy/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (287769 => 287770)


--- trunk/Source/WebKitLegacy/PlatformMac.cmake	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake	2022-01-07 19:24:05 UTC (rev 287770)
@@ -600,9 +600,9 @@
     if (NOT ${_c99_index} EQUAL -1)
         set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
     elseif (NOT ${_cpp_index} EQUAL -1)
-        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c++2a)
+        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c++1z)
     else ()
-        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++2a")
+        set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++17")
     endif ()
 endforeach ()
 

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (287769 => 287770)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Tim Horton  <timothy_hor...@apple.com>
 
         Move linkedOnOrAfter() to WTF

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -33,7 +33,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (287769 => 287770)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -161,7 +161,7 @@
 SUPPORTS_TEXT_BASED_API[sdk=iphone*] = YES;
 SUPPORTS_TEXT_BASED_API[sdk=appletv*] = NO;
 SUPPORTS_TEXT_BASED_API[sdk=watch*] = NO;
-OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=gnu++2a -fno-rtti $(WK_CFLAGS_BUILD_FOR_TESTING_$(WK_BUILD_FOR_TESTING)) -DRELEASE_WITHOUT_OPTIMIZATIONS -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h -extra-private-header $(SOURCE_ROOT)/mac/TestingFunctions.h;
+OTHER_TAPI_FLAGS[sdk=iphone*] = -x objective-c++ -std=gnu++1z -fno-rtti $(WK_CFLAGS_BUILD_FOR_TESTING_$(WK_BUILD_FOR_TESTING)) -DRELEASE_WITHOUT_OPTIMIZATIONS -exclude-private-header $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/NSURLDownloadSPI.h -extra-private-header $(SOURCE_ROOT)/mac/TestingFunctions.h;
 TAPI_VERIFY_MODE[sdk=iphone*] = Pedantic;
 
 DEFINES_MODULE = $(DEFINES_MODULE_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));

Modified: trunk/Source/WebKitLegacy/mac/MigrateHeaders.make (287769 => 287770)


--- trunk/Source/WebKitLegacy/mac/MigrateHeaders.make	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/WebKitLegacy/mac/MigrateHeaders.make	2022-01-07 19:24:05 UTC (rev 287770)
@@ -38,7 +38,7 @@
 
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
-FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++2a -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
+FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
 
 # --------
 

Modified: trunk/Source/bmalloc/ChangeLog (287769 => 287770)


--- trunk/Source/bmalloc/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/bmalloc/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Alex Christensen  <achristen...@webkit.org>
 
         Start using C++20

Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Source/bmalloc/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_ARC = YES;
 CLANG_ENABLE_OBJC_WEAK = YES;

Modified: trunk/Source/cmake/OptionsCommon.cmake (287769 => 287770)


--- trunk/Source/cmake/OptionsCommon.cmake	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/cmake/OptionsCommon.cmake	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,4 +1,4 @@
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

Modified: trunk/Source/cmake/WebKitCompilerFlags.cmake (287769 => 287770)


--- trunk/Source/cmake/WebKitCompilerFlags.cmake	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Source/cmake/WebKitCompilerFlags.cmake	2022-01-07 19:24:05 UTC (rev 287770)
@@ -383,7 +383,7 @@
         #include <filesystem>
         int main() { std::filesystem::path p1(\"\"); std::filesystem::status(p1); }
     ")
-    set(CMAKE_REQUIRED_FLAGS "--std=c++2a")
+    set(CMAKE_REQUIRED_FLAGS "--std=c++17")
     check_cxx_source_compiles("${FILESYSTEM_TEST_SOURCE}" STD_FILESYSTEM_IS_AVAILABLE)
     if (NOT STD_FILESYSTEM_IS_AVAILABLE)
         set(EXPERIMENTAL_FILESYSTEM_TEST_SOURCE "

Modified: trunk/Tools/ChangeLog (287769 => 287770)


--- trunk/Tools/ChangeLog	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/ChangeLog	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1,3 +1,15 @@
+2022-01-07  Alex Christensen  <achristen...@webkit.org>
+
+        Unreviewed, reverting r287698.
+
+        Broke an internal build
+
+        Reverted changeset:
+
+        "Start using C++20"
+        https://bugs.webkit.org/show_bug.cgi?id=233963
+        https://commits.webkit.org/r287698
+
 2022-01-06  Lauro Moura  <lmo...@igalia.com>
 
         [GLIB] Make API test initialize localstorage to ensure the database file is created

Modified: trunk/Tools/DumpRenderTree/DerivedSources.make (287769 => 287770)


--- trunk/Tools/DumpRenderTree/DerivedSources.make	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/DumpRenderTree/DerivedSources.make	2022-01-07 19:24:05 UTC (rev 287770)
@@ -35,7 +35,7 @@
 
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
-FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++2a -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
+FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
 
 # FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(DumpRenderTree)/DerivedSources.make

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -41,7 +41,7 @@
 
 FRAMEWORK_SEARCH_PATHS = $(WK_PRIVATE_FRAMEWORKS_DIR);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;

Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,7 +31,7 @@
 
 GCC_PREPROCESSOR_DEFINITIONS = DISABLE_LEGACY_WEBKIT_DEPRECATIONS $(inherited);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;

Modified: trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/MobileMiniBrowser/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 CLANG_ANALYZER_NONNULL = YES;
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_MODULES = YES;
 CLANG_ENABLE_OBJC_ARC = YES;

Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -29,7 +29,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp (287769 => 287770)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Expected.cpp	2022-01-07 19:24:05 UTC (rev 287770)
@@ -291,8 +291,6 @@
 
 template<typename T>
 struct NonCopyable {
-    NonCopyable(T&& t)
-        : value(std::forward<T>(t)) { }
     NonCopyable(NonCopyable&&) = default;
     NonCopyable(const NonCopyable&) = delete;
     NonCopyable& operator=(const NonCopyable&) = delete;

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp (287769 => 287770)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/URLParser.cpp	2022-01-07 19:24:05 UTC (rev 287770)
@@ -1076,13 +1076,13 @@
     checkURL("a://A", {"a", "", "", "A", 0, "", "", "", "a://A"});
     checkURL("a://A:2", {"a", "", "", "A", 2, "", "", "", "a://A:2"});
     checkURL("a://A:2/", {"a", "", "", "A", 2, "/", "", "", "a://A:2/"});
-    checkURLDifferences(reinterpret_cast<const char*>(u8"asd://ß"),
+    checkURLDifferences(u8"asd://ß",
         {"asd", "", "", "%C3%83%C2%9F", 0, "", "", "", "asd://%C3%83%C2%9F"},
         {"", "", "", "", 0, "", "", "", "about:blank"}, TestTabs::No);
-    checkURLDifferences(reinterpret_cast<const char*>(u8"asd://ß:4"),
+    checkURLDifferences(u8"asd://ß:4",
         {"asd", "", "", "%C3%83%C2%9F", 4, "", "", "", "asd://%C3%83%C2%9F:4"},
         {"", "", "", "", 0, "", "", "", "about:blank"}, TestTabs::No);
-    checkURLDifferences(reinterpret_cast<const char*>(u8"asd://ß:4/"),
+    checkURLDifferences(u8"asd://ß:4/",
         {"asd", "", "", "%C3%83%C2%9F", 4, "/", "", "", "asd://%C3%83%C2%9F:4/"},
         {"", "", "", "", 0, "", "", "", "about:blank"}, TestTabs::No);
     checkURLDifferences("a://[A::b]:4",

Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -29,7 +29,7 @@
 USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
 USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++1z;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 ENABLE_STRICT_OBJC_MSGSEND = YES;

Modified: trunk/Tools/WebKitTestRunner/DerivedSources.make (287769 => 287770)


--- trunk/Tools/WebKitTestRunner/DerivedSources.make	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/WebKitTestRunner/DerivedSources.make	2022-01-07 19:24:05 UTC (rev 287770)
@@ -40,7 +40,7 @@
 
 FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
 HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
-FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++2a -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
+FEATURE_AND_PLATFORM_DEFINES := $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
 
 # FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebKitTestRunner)/DerivedSources.make

Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (287769 => 287770)


--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2022-01-07 19:22:52 UTC (rev 287769)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2022-01-07 19:24:05 UTC (rev 287770)
@@ -31,7 +31,7 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO;
 
-CLANG_CXX_LANGUAGE_STANDARD = gnu++2a;
+CLANG_CXX_LANGUAGE_STANDARD = gnu++17;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to