Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (264629 => 264630)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-20 23:18:34 UTC (rev 264630)
@@ -1,3 +1,19 @@
+2020-07-20 Adrian Perez de Castro <[email protected]>
+
+ Non unified build fixes, midsummer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=213616
+
+ Unreviewed build fix.
+
+ * b3/air/AirTmpInlines.h:
+ (JSC::B3::Air::TmpWidth::widths): Moved from AirTmpWidth.h
+ * b3/air/AirTmpWidth.cpp: Included AirTmpInlines.h
+ * b3/air/AirTmpWidth.h: TmpWidth::widths() moved out from here.
+ * runtime/ExceptionFuzz.cpp: Add missing inclusion of JSCJSValueInlines.h
+ * runtime/StructureIDTable.cpp: Add missing inclusions of wtf/DataLog.h
+ and wtf/RawPointer.h
+ * runtime/VMTraps.cpp: Ditto.
+
2020-07-20 Keith Miller <[email protected]>
Add support for FinalizationRegistries
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (264629 => 264630)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2020-07-20 23:18:34 UTC (rev 264630)
@@ -695,6 +695,7 @@
0FEC858C1BDACDC70080FF74 /* AirStackSlot.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC85671BDACDC70080FF74 /* AirStackSlot.h */; };
0FEC858E1BDACDC70080FF74 /* AirTmp.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC85691BDACDC70080FF74 /* AirTmp.h */; };
0FEC858F1BDACDC70080FF74 /* AirTmpInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC856A1BDACDC70080FF74 /* AirTmpInlines.h */; };
+ 0FEC858F2BDACDC70080FF74 /* AirTmpWidthInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC858F2BDACDC70080FF74 /* AirTmpWidthInlines.h */; };
0FEC85911BDACDC70080FF74 /* AirValidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEC856C1BDACDC70080FF74 /* AirValidate.h */; };
0FEC85A31BDB5CF10080FF74 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
0FEC85A41BDB5CF10080FF74 /* _javascript_Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* _javascript_Core.framework */; };
@@ -3198,6 +3199,7 @@
0FEC85681BDACDC70080FF74 /* AirTmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirTmp.cpp; path = b3/air/AirTmp.cpp; sourceTree = "<group>"; };
0FEC85691BDACDC70080FF74 /* AirTmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirTmp.h; path = b3/air/AirTmp.h; sourceTree = "<group>"; };
0FEC856A1BDACDC70080FF74 /* AirTmpInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirTmpInlines.h; path = b3/air/AirTmpInlines.h; sourceTree = "<group>"; };
+ 0FEC858F2BDACDC70080FF74 /* AirTmpWidthInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirTmpWidthInlines.h; path = b3/air/AirTmpWidthInlines.h; sourceTree = "<group>"; };
0FEC856B1BDACDC70080FF74 /* AirValidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirValidate.cpp; path = b3/air/AirValidate.cpp; sourceTree = "<group>"; };
0FEC856C1BDACDC70080FF74 /* AirValidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AirValidate.h; path = b3/air/AirValidate.h; sourceTree = "<group>"; };
0FEC85921BDB1E100080FF74 /* AirGenerated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirGenerated.cpp; path = b3/air/AirGenerated.cpp; sourceTree = "<group>"; };
@@ -5926,6 +5928,7 @@
0F9C03D41E9476F000CD9125 /* AirTmpSet.h */,
0FE0E4AB1C24C94A002E17B6 /* AirTmpWidth.cpp */,
0FE0E4AC1C24C94A002E17B6 /* AirTmpWidth.h */,
+ 0FEC858F2BDACDC70080FF74 /* AirTmpWidthInlines.h */,
0F3730921C0D67EE00052BFA /* AirUseCounts.h */,
0FEC856B1BDACDC70080FF74 /* AirValidate.cpp */,
0FEC856C1BDACDC70080FF74 /* AirValidate.h */,
Modified: trunk/Source/_javascript_Core/b3/air/AirAllocateRegistersByGraphColoring.cpp (264629 => 264630)
--- trunk/Source/_javascript_Core/b3/air/AirAllocateRegistersByGraphColoring.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/b3/air/AirAllocateRegistersByGraphColoring.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -35,8 +35,7 @@
#include "AirLiveness.h"
#include "AirPadInterference.h"
#include "AirPhaseScope.h"
-#include "AirTmpInlines.h"
-#include "AirTmpWidth.h"
+#include "AirTmpWidthInlines.h"
#include "AirUseCounts.h"
namespace JSC { namespace B3 { namespace Air {
Modified: trunk/Source/_javascript_Core/b3/air/AirTmpWidth.cpp (264629 => 264630)
--- trunk/Source/_javascript_Core/b3/air/AirTmpWidth.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/b3/air/AirTmpWidth.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -30,6 +30,7 @@
#include "AirCode.h"
#include "AirInstInlines.h"
+#include "AirTmpWidthInlines.h"
#include <wtf/ListDump.h>
namespace JSC { namespace B3 { namespace Air {
Modified: trunk/Source/_javascript_Core/b3/air/AirTmpWidth.h (264629 => 264630)
--- trunk/Source/_javascript_Core/b3/air/AirTmpWidth.h 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/b3/air/AirTmpWidth.h 2020-07-20 23:18:34 UTC (rev 264630)
@@ -103,17 +103,8 @@
Width def;
};
- Widths& widths(Tmp tmp)
- {
- if (tmp.isGP()) {
- unsigned index = AbsoluteTmpMapper<GP>::absoluteIndex(tmp);
- ASSERT(index < m_widthGP.size());
- return m_widthGP[index];
- }
- unsigned index = AbsoluteTmpMapper<FP>::absoluteIndex(tmp);
- ASSERT(index < m_widthFP.size());
- return m_widthFP[index];
- }
+ inline Widths& widths(Tmp);
+
const Widths& widths(Tmp tmp) const
{
return const_cast<TmpWidth*>(this)->widths(tmp);
Added: trunk/Source/_javascript_Core/b3/air/AirTmpWidthInlines.h (0 => 264630)
--- trunk/Source/_javascript_Core/b3/air/AirTmpWidthInlines.h (rev 0)
+++ trunk/Source/_javascript_Core/b3/air/AirTmpWidthInlines.h 2020-07-20 23:18:34 UTC (rev 264630)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015-2017 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
+
+#if ENABLE(B3_JIT)
+
+#include "AirTmpInlines.h"
+#include "AirTmpWidth.h"
+
+namespace JSC { namespace B3 { namespace Air {
+
+inline TmpWidth::Widths& TmpWidth::widths(Tmp tmp)
+{
+ if (tmp.isGP()) {
+ unsigned index = AbsoluteTmpMapper<GP>::absoluteIndex(tmp);
+ ASSERT(index < m_widthGP.size());
+ return m_widthGP[index];
+ }
+ unsigned index = AbsoluteTmpMapper<FP>::absoluteIndex(tmp);
+ ASSERT(index < m_widthFP.size());
+ return m_widthFP[index];
+}
+
+} } } // namespace JSC::B3::Air
+
+#endif // ENABLE(B3_JIT)
Modified: trunk/Source/_javascript_Core/runtime/ExceptionFuzz.cpp (264629 => 264630)
--- trunk/Source/_javascript_Core/runtime/ExceptionFuzz.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/runtime/ExceptionFuzz.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -28,6 +28,7 @@
#include "Error.h"
#include "HeapInlines.h"
+#include "JSCJSValueInlines.h"
#include "TestRunnerUtils.h"
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp (264629 => 264630)
--- trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/runtime/StructureIDTable.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -27,6 +27,8 @@
#include "StructureIDTable.h"
#include <wtf/Atomics.h>
+#include <wtf/DataLog.h>
+#include <wtf/RawPointer.h>
namespace JSC {
Modified: trunk/Source/_javascript_Core/runtime/VMTraps.cpp (264629 => 264630)
--- trunk/Source/_javascript_Core/runtime/VMTraps.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/_javascript_Core/runtime/VMTraps.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -32,6 +32,7 @@
#include "DFGCommonData.h"
#include "ExceptionHelpers.h"
#include "HeapInlines.h"
+#include "JSCJSValueInlines.h"
#include "LLIntPCRanges.h"
#include "MachineContext.h"
#include "MacroAssemblerCodeRef.h"
Modified: trunk/Source/WTF/ChangeLog (264629 => 264630)
--- trunk/Source/WTF/ChangeLog 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WTF/ChangeLog 2020-07-20 23:18:34 UTC (rev 264630)
@@ -1,3 +1,13 @@
+2020-07-20 Adrian Perez de Castro <[email protected]>
+
+ Non unified build fixes, midsummer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=213616
+
+ Unreviewed build fix.
+
+ * wtf/text/StringParsingBuffer.h: Add missing inclusion of wtf/text/StringView.h,
+ and removed other now-unneeded header inclusions.
+
2020-07-19 Geoffrey Garen <[email protected]>
There should be only one RunLoop Timer class
Modified: trunk/Source/WTF/wtf/text/StringParsingBuffer.h (264629 => 264630)
--- trunk/Source/WTF/wtf/text/StringParsingBuffer.h 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WTF/wtf/text/StringParsingBuffer.h 2020-07-20 23:18:34 UTC (rev 264630)
@@ -25,9 +25,7 @@
#pragma once
-#include <wtf/Forward.h>
-#include <wtf/text/LChar.h>
-#include <wtf/text/StringCommon.h>
+#include <wtf/text/StringView.h>
namespace WTF {
Modified: trunk/Source/WebCore/ChangeLog (264629 => 264630)
--- trunk/Source/WebCore/ChangeLog 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WebCore/ChangeLog 2020-07-20 23:18:34 UTC (rev 264630)
@@ -1,3 +1,14 @@
+2020-07-20 Adrian Perez de Castro <[email protected]>
+
+ Non unified build fixes, midsummer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=213616
+
+ Unreviewed build fix.
+
+ No new tests needed.
+
+ * inspector/InspectorInstrumentationWebKit.h: Forward-declare ResourceLoader class.
+
2020-07-20 Wenson Hsieh <[email protected]>
REGRESSION (r261874): Typing near the bottom of a scrollable document causes the scroll position to jump
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentationWebKit.h (264629 => 264630)
--- trunk/Source/WebCore/inspector/InspectorInstrumentationWebKit.h 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentationWebKit.h 2020-07-20 23:18:34 UTC (rev 264630)
@@ -33,6 +33,7 @@
namespace WebCore {
class Frame;
+class ResourceLoader;
class ResourceRequest;
class ResourceResponse;
class SharedBuffer;
Modified: trunk/Source/WebKit/ChangeLog (264629 => 264630)
--- trunk/Source/WebKit/ChangeLog 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WebKit/ChangeLog 2020-07-20 23:18:34 UTC (rev 264630)
@@ -1,3 +1,12 @@
+2020-07-20 Adrian Perez de Castro <[email protected]>
+
+ Non unified build fixes, midsummer 2020 edition
+ https://bugs.webkit.org/show_bug.cgi?id=213616
+
+ Unreviewed build fix.
+
+ * NetworkProcess/soup/WebSocketTaskSoup.cpp: Add missing inclusion of NetworkProcess.h
+
2020-07-20 Brian Burg <[email protected]>
Web Inspector: developerExtrasEnabled should be respected when opening local Web Inspector
Modified: trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp (264629 => 264630)
--- trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp 2020-07-20 23:15:48 UTC (rev 264629)
+++ trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp 2020-07-20 23:18:34 UTC (rev 264630)
@@ -27,6 +27,7 @@
#include "WebSocketTaskSoup.h"
#include "DataReference.h"
+#include "NetworkProcess.h"
#include "NetworkSocketChannel.h"
#include <WebCore/HTTPParsers.h>
#include <WebCore/ResourceRequest.h>
