Changeset 192912 in webkit for trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

Timestamp:

Dec 1, 2015, 2:12:42 PM (10 years ago)

Author:

[email protected]

Message:

Remove repetitive cruft from FTL OSR exit code in LowerDFGToLLVM
​https://bugs.webkit.org/show_bug.cgi?id=151718

Reviewed by Geoffrey Garen.

• b3/B3StackmapValue.h:
• ftl/FTLLowerDFGToLLVM.cpp:

(JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitArgumentsForPatchpointIfWillCatchException):
(JSC::FTL::DFG::LowerDFGToLLVM::lowBlock):
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitDescriptor):
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExit):
(JSC::FTL::DFG::LowerDFGToLLVM::blessSpeculation):
(JSC::FTL::DFG::LowerDFGToLLVM::emitOSRExitCall):
(JSC::FTL::DFG::LowerDFGToLLVM::buildExitArguments):
(JSC::FTL::DFG::LowerDFGToLLVM::callStackmap):

File:

• trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (modified) (10 diffs)

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp

@@ -5284 +5284 @@
         OSRExitDescriptor& exitDescriptor = m_ftlState.jitCode->osrExitDescriptors.last();
         
-        StackmapArgumentList arguments =
-            buildExitArguments(exitDescriptor, FormattedValue(), exitDescriptor.m_codeOrigin);
+        StackmapArgumentList arguments = buildExitArguments(exitDescriptor, FormattedValue());
         callStackmap(exitDescriptor, arguments);
         
@@ -9181 +9180 @@
 
         StackmapArgumentList freshList =
-            buildExitArguments(exitDescriptor, noValue(), exitDescriptor.m_codeOrigin, offsetOfExitArguments);
+            buildExitArguments(exitDescriptor, noValue(), offsetOfExitArguments);
         arguments.appendVector(freshList);
     }
@@ -9202 +9201 @@
     }
 
-    void appendOSRExitDescriptor(ExitKind kind, ExceptionType exceptionType, FormattedValue lowValue, Node* highValue, NodeOrigin origin)
-    {
-        m_ftlState.jitCode->osrExitDescriptors.append(OSRExitDescriptor(
+    OSRExitDescriptor& appendOSRExitDescriptor(ExitKind kind, ExceptionType exceptionType, FormattedValue lowValue, Node* highValue, NodeOrigin origin)
+    {
+        return m_ftlState.jitCode->osrExitDescriptors.alloc(
             kind, exceptionType, lowValue.format(), m_graph.methodOfGettingAValueProfileFor(highValue),
             origin.forExit, origin.semantic,
             availabilityMap().m_locals.numberOfArguments(),
-            availabilityMap().m_locals.numberOfLocals()));
+            availabilityMap().m_locals.numberOfLocals());
     }
     
@@ -9249 +9248 @@
             m_out.speculate(failCondition), kind, lowValue, highValue, origin, isExceptionHandler);
 #else // FTL_USES_B3
-        appendOSRExitDescriptor(kind, isExceptionHandler ? ExceptionType::CCallException : ExceptionType::None, lowValue, highValue, origin);
-        OSRExitDescriptor& exitDescriptor = m_ftlState.jitCode->osrExitDescriptors.last();
+        OSRExitDescriptor& exitDescriptor = appendOSRExitDescriptor(kind, isExceptionHandler ? ExceptionType::CCallException : ExceptionType::None, lowValue, highValue, origin);
 
         if (failCondition == m_out.booleanTrue) {
@@ -9278 +9276 @@
     void blessSpeculation(B3::StackmapValue* value, ExitKind kind, FormattedValue lowValue, Node* highValue, NodeOrigin origin, bool isExceptionHandler = false)
     {
-        appendOSRExitDescriptor(kind, isExceptionHandler ? ExceptionType::CCallException : ExceptionType::None, lowValue, highValue, origin);
-        OSRExitDescriptor& exitDescriptor = m_ftlState.jitCode->osrExitDescriptors.last();
-        CodeOrigin codeOrigin = exitDescriptor.m_codeOrigin;
-        StackmapArgumentList arguments = buildExitArguments(exitDescriptor, lowValue, codeOrigin);
-        for (LValue child : arguments)
-            value->append(child);
+        OSRExitDescriptor& exitDescriptor = appendOSRExitDescriptor(kind, isExceptionHandler ? ExceptionType::CCallException : ExceptionType::None, lowValue, highValue, origin);
+        value->appendAnys(buildExitArguments(exitDescriptor, lowValue));
         value->setGenerator(
             [&] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {
@@ -9294 +9288 @@
     void emitOSRExitCall(OSRExitDescriptor& exitDescriptor, FormattedValue lowValue)
     {
-        StackmapArgumentList arguments;
-        
-        CodeOrigin codeOrigin = exitDescriptor.m_codeOrigin;
-        
-        buildExitArguments(exitDescriptor, arguments, lowValue, codeOrigin);
-        
-        callStackmap(exitDescriptor, arguments);
+        callStackmap(exitDescriptor, buildExitArguments(exitDescriptor, lowValue));
     }
 #endif
 
     StackmapArgumentList buildExitArguments(
-        OSRExitDescriptor& exitDescriptor, FormattedValue lowValue, CodeOrigin codeOrigin,
+        OSRExitDescriptor& exitDescriptor, FormattedValue lowValue,
         unsigned offsetOfExitArgumentsInStackmapLocations = 0)
     {
         StackmapArgumentList result;
         buildExitArguments(
-            exitDescriptor, result, lowValue, codeOrigin, offsetOfExitArgumentsInStackmapLocations);
+            exitDescriptor, result, lowValue, offsetOfExitArgumentsInStackmapLocations);
         return result;
     }
@@ -9316 +9304 @@
     void buildExitArguments(
         OSRExitDescriptor& exitDescriptor, StackmapArgumentList& arguments, FormattedValue lowValue,
-        CodeOrigin codeOrigin, unsigned offsetOfExitArgumentsInStackmapLocations = 0)
+        unsigned offsetOfExitArgumentsInStackmapLocations = 0)
     {
         if (!!lowValue)
@@ -9322 +9310 @@
         
         AvailabilityMap availabilityMap = this->availabilityMap();
-        availabilityMap.pruneByLiveness(m_graph, codeOrigin);
+        availabilityMap.pruneByLiveness(m_graph, exitDescriptor.m_codeOrigin);
         
         HashMap<Node*, ExitTimeObjectMaterialization*> map;
@@ -9349 +9337 @@
                 DFG_ASSERT(
                     m_graph, m_node,
-                    (!(availability.isDead() && m_graph.isLiveInBytecode(VirtualRegister(operand), codeOrigin))) || m_graph.m_plan.mode == FTLForOSREntryMode);
+                    (!(availability.isDead() && m_graph.isLiveInBytecode(VirtualRegister(operand), exitDescriptor.m_codeOrigin))) || m_graph.m_plan.mode == FTLForOSREntryMode);
             }
             ExitValue exitValue = exitValueForAvailability(arguments, map, availability);
@@ -9379 +9367 @@
 
 #if !FTL_USES_B3
-    void callStackmap(OSRExitDescriptor& exitDescriptor, StackmapArgumentList& arguments)
+    void callStackmap(OSRExitDescriptor& exitDescriptor, StackmapArgumentList arguments)
     {
         exitDescriptor.m_stackmapID = m_stackmapIDs++;