Changeset 257237 in webkit

Timestamp:

Feb 24, 2020 1:18:35 PM (4 years ago)

Author:

ysuzuki@apple.com

Message:

Unreviewed, fix watchOS build
​https://bugs.webkit.org/show_bug.cgi?id=207827

While watchOS does not use FTL at all, it still compiles.

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileObjectKeys):
(JSC::FTL::DFG::LowerDFGToB3::compileCreatePromise):
(JSC::FTL::DFG::LowerDFGToB3::compileCreateInternalFieldObject):
(JSC::FTL::DFG::LowerDFGToB3::compileCheckSubClass):
(JSC::FTL::DFG::LowerDFGToB3::loadStructureClassInfo):
(JSC::FTL::DFG::LowerDFGToB3::loadStructureCachedPrototypeChainOrRareData):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLLowerDFGToB3.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-02-24  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Unreviewed, fix watchOS build
+        https://bugs.webkit.org/show_bug.cgi?id=207827
+
+        While watchOS does not use FTL at all, it still compiles.
+
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileObjectKeys):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCreatePromise):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCreateInternalFieldObject):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCheckSubClass):
+        (JSC::FTL::DFG::LowerDFGToB3::loadStructureClassInfo):
+        (JSC::FTL::DFG::LowerDFGToB3::loadStructureCachedPrototypeChainOrRareData):
+
 2020-02-24  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -6092 +6092 @@
                 LValue object = lowObject(m_node->child1());
                 LValue structure = loadStructure(object);
-                LValue cachedPrototypeChainOrRareData = m_out.bitAnd(m_out.constIntPtr(Structure::cachedPrototypeChainOrRareDataMask), m_out.loadPtr(structure, m_heaps.Structure_cachedPrototypeChainOrRareData));
+                LValue cachedPrototypeChainOrRareData = loadStructureCachedPrototypeChainOrRareData(structure);
                 m_out.branch(m_out.notNull(cachedPrototypeChainOrRareData), unsure(notNullCase), unsure(slowCase));
 
@@ -6676 +6676 @@
 
         m_out.appendTo(hasStructure, checkGlobalObjectCase);
-        LValue classInfo = m_out.bitAnd(m_out.loadPtr(structure, m_heaps.Structure_classInfo), m_out.constIntPtr(Structure::classInfoMask));
+        LValue classInfo = loadStructureClassInfo(structure);
         m_out.branch(m_out.equal(classInfo, m_out.constIntPtr(m_node->isInternalPromise() ? JSInternalPromise::info() : JSPromise::info())), usually(checkGlobalObjectCase), rarely(slowCase));
 
@@ -6732 +6732 @@
 
         m_out.appendTo(hasStructure, checkGlobalObjectCase);
-        LValue classInfo = m_out.bitAnd(m_out.loadPtr(structure, m_heaps.Structure_classInfo), m_out.constIntPtr(Structure::classInfoMask));
+        LValue classInfo = loadStructureClassInfo(structure);
         m_out.branch(m_out.equal(classInfo, m_out.constIntPtr(JSClass::info())), usually(checkGlobalObjectCase), rarely(slowCase));
 
@@ -13211 +13211 @@
 
             LValue structure = loadStructure(cell);
-            LValue classInfo = m_out.bitAnd(m_out.loadPtr(structure, m_heaps.Structure_classInfo), m_out.constIntPtr(Structure::classInfoMask));
+            LValue classInfo = loadStructureClassInfo(structure);
             ValueFromBlock otherAtStart = m_out.anchor(classInfo);
             m_out.jump(loop);
@@ -18220 +18220 @@
     }
 
+    LValue loadStructureClassInfo(LValue structure)
+    {
+        LValue result = m_out.loadPtr(structure, m_heaps.Structure_classInfo);
+#if CPU(ADDRESS64)
+        return m_out.bitAnd(m_out.constIntPtr(Structure::classInfoMask), result);
+#else
+        return result;
+#endif
+    }
+
+    LValue loadStructureCachedPrototypeChainOrRareData(LValue structure)
+    {
+        LValue result = m_out.loadPtr(structure, m_heaps.Structure_cachedPrototypeChainOrRareData);
+#if CPU(ADDRESS64)
+        return m_out.bitAnd(m_out.constIntPtr(Structure::cachedPrototypeChainOrRareDataMask), result);
+#else
+        return result;
+#endif
+    }
+
     LValue weakPointer(JSCell* pointer)
     {