Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (261054 => 261055)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-02 21:23:00 UTC (rev 261055)
@@ -1,3 +1,13 @@
+2020-05-02 Mark Lam <[email protected]>
+
+ Gardening: rolling out r261050 and r261051.
+ https://bugs.webkit.org/show_bug.cgi?id=211328
+ <rdar://problem/62755865>
+
+ Not reviewed.
+
+ * assembler/CPU.h:
+
2020-05-01 Mark Lam <[email protected]>
Allow Bitmap to use up to a UCPURegister word size for internal bit storage.
Modified: trunk/Source/_javascript_Core/assembler/CPU.h (261054 => 261055)
--- trunk/Source/_javascript_Core/assembler/CPU.h 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/_javascript_Core/assembler/CPU.h 2020-05-02 21:23:00 UTC (rev 261055)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,10 +27,17 @@
#include "Options.h"
#include <wtf/NumberOfCores.h>
-#include <wtf/StdIntExtras.h>
namespace JSC {
+#if USE(JSVALUE64)
+using CPURegister = int64_t;
+using UCPURegister = uint64_t;
+#else
+using CPURegister = int32_t;
+using UCPURegister = uint32_t;
+#endif
+
using UCPUStrictInt32 = UCPURegister;
constexpr bool isARMv7IDIVSupported()
Modified: trunk/Source/WTF/ChangeLog (261054 => 261055)
--- trunk/Source/WTF/ChangeLog 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/WTF/ChangeLog 2020-05-02 21:23:00 UTC (rev 261055)
@@ -1,5 +1,20 @@
2020-05-02 Mark Lam <[email protected]>
+ Gardening: rolling out r261050 and r261051.
+ https://bugs.webkit.org/show_bug.cgi?id=211328
+ <rdar://problem/62755865>
+
+ Not reviewed.
+
+ Appears to make editing/undo-manager/undo-manager-delete-stale-undo-items.html timeout always.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/Bitmap.h:
+ * wtf/CMakeLists.txt:
+ * wtf/StdIntExtras.h: Removed.
+
+2020-05-02 Mark Lam <[email protected]>
+
[Follow up] Allow Bitmap to use up to a UCPURegister word size for internal bit storage.
https://bugs.webkit.org/show_bug.cgi?id=211328
<rdar://problem/62755865>
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (261054 => 261055)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-05-02 21:23:00 UTC (rev 261055)
@@ -751,7 +751,6 @@
FE8225301B2A1E5B00BA68FD /* NakedPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NakedPtr.h; sourceTree = "<group>"; };
FE86A8741E59440200111BBF /* ForbidHeapAllocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForbidHeapAllocation.h; sourceTree = "<group>"; };
FE8925AF1D00DAEC0046907E /* Indenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Indenter.h; sourceTree = "<group>"; };
- FE97F6A8245CE5DD00C63FC6 /* StdIntExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdIntExtras.h; sourceTree = "<group>"; };
FEB6B035201BE0B600B958C1 /* PointerPreparations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PointerPreparations.h; sourceTree = "<group>"; };
FEDACD3B1630F83F00C69634 /* StackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StackStats.cpp; sourceTree = "<group>"; };
FEDACD3C1630F83F00C69634 /* StackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackStats.h; sourceTree = "<group>"; };
@@ -1235,7 +1234,6 @@
FEDACD3C1630F83F00C69634 /* StackStats.h */,
313EDEC9778E49C9BEA91CFC /* StackTrace.cpp */,
EF7D6CD59D8642A8A0DA86AD /* StackTrace.h */,
- FE97F6A8245CE5DD00C63FC6 /* StdIntExtras.h */,
A8A47311151A825B004123FF /* StdLibExtras.h */,
FF0A436588954F3CB07DBECA /* StdList.h */,
391BD6BA4D164FD294F9A93D /* StdMap.h */,
Modified: trunk/Source/WTF/wtf/Bitmap.h (261054 => 261055)
--- trunk/Source/WTF/wtf/Bitmap.h 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/WTF/wtf/Bitmap.h 2020-05-02 21:23:00 UTC (rev 261055)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,21 +22,17 @@
#include <array>
#include <wtf/Atomics.h>
#include <wtf/HashFunctions.h>
-#include <wtf/StdIntExtras.h>
#include <wtf/StdLibExtras.h>
+#include <stdint.h>
#include <string.h>
-#include <type_traits>
namespace WTF {
-template<size_t size>
-using BitmapWordType = std::conditional_t<(size <= 32 && sizeof(UCPURegister) > sizeof(uint32_t)), uint32_t, UCPURegister>;
-
-template<size_t bitmapSize, typename WordType = BitmapWordType<bitmapSize>>
+template<size_t bitmapSize, typename WordType = uint32_t>
class Bitmap final {
WTF_MAKE_FAST_ALLOCATED;
- static_assert(sizeof(WordType) <= sizeof(UCPURegister), "WordType must not be bigger than the CPU atomic word size");
+ static_assert(sizeof(WordType) <= sizeof(unsigned), "WordType must not be bigger than unsigned");
public:
constexpr Bitmap();
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (261054 => 261055)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2020-05-02 21:23:00 UTC (rev 261055)
@@ -238,7 +238,6 @@
StackShotProfiler.h
StackStats.h
StackTrace.h
- StdIntExtras.h
StdLibExtras.h
StdList.h
StdMap.h
Deleted: trunk/Source/WTF/wtf/StdIntExtras.h (261054 => 261055)
--- trunk/Source/WTF/wtf/StdIntExtras.h 2020-05-02 21:21:19 UTC (rev 261054)
+++ trunk/Source/WTF/wtf/StdIntExtras.h 2020-05-02 21:23:00 UTC (rev 261055)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <cstdint>
-
-namespace WTF {
-
-#if USE(JSVALUE64)
-using CPURegister = int64_t;
-using UCPURegister = uint64_t;
-#else
-using CPURegister = int32_t;
-using UCPURegister = uint32_t;
-#endif
-
-} // namespace WTF
-
-using WTF::CPURegister;
-using WTF::UCPURegister;
