- Revision
- 271599
- Author
- [email protected]
- Date
- 2021-01-19 03:38:01 -0800 (Tue, 19 Jan 2021)
Log Message
Non-unified build fixes, mid January 2021 edition
https://bugs.webkit.org/show_bug.cgi?id=220725
Unreviewed non-unified build fixes.
Source/_javascript_Core:
* runtime/JSObject.cpp:
(JSC::JSObject::getNonReifiedStaticPropertyNames): Remove inline function from here,
as it is used in JSPropertyNameEnumerator.cpp and the compiler needs to see the function
body to be able to inline it, otherwise linking fails.
* runtime/JSObjectInlines.h:
(JSC::JSObject::getNonReifiedStaticPropertyNames): Moved inline function here.
* wasm/WasmInstance.cpp: Add missing JSWebAssemblyHelpers.h header.
* wasm/js/WebAssemblyModuleRecord.cpp: Add missing ObjectConstructor.h header.
Source/WebCore:
No new tests needed.
* rendering/RenderLayerScrollableArea.cpp: Add missing header includes.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (271598 => 271599)
--- trunk/Source/_javascript_Core/ChangeLog 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-01-19 11:38:01 UTC (rev 271599)
@@ -1,3 +1,19 @@
+2021-01-19 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes, mid January 2021 edition
+ https://bugs.webkit.org/show_bug.cgi?id=220725
+
+ Unreviewed non-unified build fixes.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::getNonReifiedStaticPropertyNames): Remove inline function from here,
+ as it is used in JSPropertyNameEnumerator.cpp and the compiler needs to see the function
+ body to be able to inline it, otherwise linking fails.
+ * runtime/JSObjectInlines.h:
+ (JSC::JSObject::getNonReifiedStaticPropertyNames): Moved inline function here.
+ * wasm/WasmInstance.cpp: Add missing JSWebAssemblyHelpers.h header.
+ * wasm/js/WebAssemblyModuleRecord.cpp: Add missing ObjectConstructor.h header.
+
2021-01-18 Yusuke Suzuki <[email protected]>
[JSC] FTL::prepareOSREntry can clear OSR entry CodeBlock if it is already invalidated
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (271598 => 271599)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2021-01-19 11:38:01 UTC (rev 271599)
@@ -72,24 +72,6 @@
const ClassInfo JSFinalObject::s_info = { "Object", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSFinalObject) };
-ALWAYS_INLINE void JSObject::getNonReifiedStaticPropertyNames(VM& vm, PropertyNameArray& propertyNames, DontEnumPropertiesMode mode)
-{
- if (staticPropertiesReified(vm))
- return;
-
- // Add properties from the static hashtables of properties
- for (const ClassInfo* info = classInfo(vm); info; info = info->parentClass) {
- const HashTable* table = info->staticPropHashTable;
- if (!table)
- continue;
-
- for (auto iter = table->begin(); iter != table->end(); ++iter) {
- if (mode == DontEnumPropertiesMode::Include || !(iter->attributes() & PropertyAttribute::DontEnum))
- propertyNames.add(Identifier::fromString(vm, iter.key()));
- }
- }
-}
-
ALWAYS_INLINE void JSObject::markAuxiliaryAndVisitOutOfLineProperties(SlotVisitor& visitor, Butterfly* butterfly, Structure* structure, PropertyOffset maxOffset)
{
// We call this when we found everything without races.
Modified: trunk/Source/_javascript_Core/runtime/JSObjectInlines.h (271598 => 271599)
--- trunk/Source/_javascript_Core/runtime/JSObjectInlines.h 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/_javascript_Core/runtime/JSObjectInlines.h 2021-01-19 11:38:01 UTC (rev 271599)
@@ -651,4 +651,22 @@
putDirect(vm, propertyName, value, putSlot);
}
+ALWAYS_INLINE void JSObject::getNonReifiedStaticPropertyNames(VM& vm, PropertyNameArray& propertyNames, DontEnumPropertiesMode mode)
+{
+ if (staticPropertiesReified(vm))
+ return;
+
+ // Add properties from the static hashtables of properties
+ for (const ClassInfo* info = classInfo(vm); info; info = info->parentClass) {
+ const HashTable* table = info->staticPropHashTable;
+ if (!table)
+ continue;
+
+ for (auto iter = table->begin(); iter != table->end(); ++iter) {
+ if (mode == DontEnumPropertiesMode::Include || !(iter->attributes() & PropertyAttribute::DontEnum))
+ propertyNames.add(Identifier::fromString(vm, iter.key()));
+ }
+ }
+}
+
} // namespace JSC
Modified: trunk/Source/_javascript_Core/wasm/WasmInstance.cpp (271598 => 271599)
--- trunk/Source/_javascript_Core/wasm/WasmInstance.cpp 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/_javascript_Core/wasm/WasmInstance.cpp 2021-01-19 11:38:01 UTC (rev 271599)
@@ -29,6 +29,7 @@
#if ENABLE(WEBASSEMBLY)
#include "JSCJSValueInlines.h"
+#include "JSWebAssemblyHelpers.h"
#include "JSWebAssemblyInstance.h"
#include "Register.h"
#include "WasmModuleInformation.h"
Modified: trunk/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp (271598 => 271599)
--- trunk/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp 2021-01-19 11:38:01 UTC (rev 271599)
@@ -37,6 +37,7 @@
#include "JSWebAssemblyInstance.h"
#include "JSWebAssemblyLinkError.h"
#include "JSWebAssemblyModule.h"
+#include "ObjectConstructor.h"
#include "WasmSignatureInlines.h"
#include "WebAssemblyFunction.h"
Modified: trunk/Source/WebCore/ChangeLog (271598 => 271599)
--- trunk/Source/WebCore/ChangeLog 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/WebCore/ChangeLog 2021-01-19 11:38:01 UTC (rev 271599)
@@ -1,3 +1,14 @@
+2021-01-19 Adrian Perez de Castro <[email protected]>
+
+ Non-unified build fixes, mid January 2021 edition
+ https://bugs.webkit.org/show_bug.cgi?id=220725
+
+ Unreviewed non-unified build fixes.
+
+ No new tests needed.
+
+ * rendering/RenderLayerScrollableArea.cpp: Add missing header includes.
+
2021-01-18 Nikolas Zimmermann <[email protected]>
Continue removing glue code from RenderLayer that was recently added in r271559
Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp (271598 => 271599)
--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp 2021-01-19 11:02:44 UTC (rev 271598)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp 2021-01-19 11:38:01 UTC (rev 271599)
@@ -46,6 +46,28 @@
#include "config.h"
#include "RenderLayerScrollableArea.h"
+#include "DebugPageOverlays.h"
+#include "DeprecatedGlobalSettings.h"
+#include "Editor.h"
+#include "ElementRuleCollector.h"
+#include "EventHandler.h"
+#include "FocusController.h"
+#include "FrameSelection.h"
+#include "HitTestResult.h"
+#include "Logging.h"
+#include "RenderFlexibleBox.h"
+#include "RenderGeometryMap.h"
+#include "RenderLayerBacking.h"
+#include "RenderLayerCompositor.h"
+#include "RenderMarquee.h"
+#include "RenderScrollbar.h"
+#include "RenderScrollbarPart.h"
+#include "RenderView.h"
+#include "ScrollAnimator.h"
+#include "ScrollbarTheme.h"
+#include "ScrollingCoordinator.h"
+#include "ShadowRoot.h"
+
namespace WebCore {
RenderLayerScrollableArea::RenderLayerScrollableArea(RenderLayer& layer)
