Changeset 230537 in webkit

Timestamp:

Apr 11, 2018 11:15:00 AM (6 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r230379. rdar://problem/39317885

Unreviewed, follow-up patch for DFG 32bit
​https://bugs.webkit.org/show_bug.cgi?id=183970

• dfg/DFGSpeculativeJIT32_64.cpp: (JSC::DFG::SpeculativeJIT::cachedGetById):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@230379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-605-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT32_64.cpp (modified) (2 diffs)

branches/safari-605-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-04-10  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r230379. rdar://problem/39317885
+
+    Unreviewed, follow-up patch for DFG 32bit
+    https://bugs.webkit.org/show_bug.cgi?id=183970
+    
+    * dfg/DFGSpeculativeJIT32_64.cpp:
+    (JSC::DFG::SpeculativeJIT::cachedGetById):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230379 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-04-08  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+            Unreviewed, follow-up patch for DFG 32bit
+            https://bugs.webkit.org/show_bug.cgi?id=183970
+
+            * dfg/DFGSpeculativeJIT32_64.cpp:
+            (JSC::DFG::SpeculativeJIT::cachedGetById):
+
 2018-04-10  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-605-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

@@ -210 +210 @@
     slowCases.append(gen.slowPathJump());
 
-    J_JITOperation_ESsiJI getByIdFunction;
-    if (type == AccessType::Get)
-        getByIdFunction = operationGetByIdOptimize;
-    else
-        getByIdFunction = operationTryGetByIdOptimize;
-
     std::unique_ptr<SlowPathGenerator> slowPath;
     if (baseTagGPROrNone == InvalidGPRReg) {
         slowPath = slowPathCall(
-            slowCases, this, getByIdFunction,
+            slowCases, this, appropriateOptimizingGetByIdFunction(type),
             JSValueRegs(resultTagGPR, resultPayloadGPR), gen.stubInfo(),
             static_cast<int32_t>(JSValue::CellTag), basePayloadGPR,
@@ -225 +219 @@
     } else {
         slowPath = slowPathCall(
-            slowCases, this, getByIdFunction,
+            slowCases, this, appropriateOptimizingGetByIdFunction(type),
             JSValueRegs(resultTagGPR, resultPayloadGPR), gen.stubInfo(), JSValueRegs(baseTagGPROrNone, basePayloadGPR), identifierUID(identifierNumber));
     }