Changeset 206212 in webkit

Timestamp:

Sep 21, 2016 9:26:13 AM (8 years ago)

Author:

msaboff@apple.com

Message:

FTL needs to reserve callee stack space in bytes
​https://bugs.webkit.org/show_bug.cgi?id=162324

Reviewed by Geoffrey Garen.

Changed two instances where we call B3::Procedure::requestCallArgAreaSize() with the
number of JSValue sized objects of stack space instead of bytes. The correct units
to use is bytes.

Renamed both the Air and B3 related callArgAreaSize() to callArgAreaSizeInBytes().

No new tests as this doesn't surface as an issue when arguments are passed on the stack.

• b3/B3Procedure.cpp:

(JSC::B3::Procedure::callArgAreaSizeInBytes):
(JSC::B3::Procedure::requestCallArgAreaSizeInBytes):
(JSC::B3::Procedure::callArgAreaSize): Deleted.
(JSC::B3::Procedure::requestCallArgAreaSize): Deleted.

• b3/B3Procedure.h:
• b3/air/AirAllocateStack.cpp:

(JSC::B3::Air::allocateStack):

• b3/air/AirCCallingConvention.cpp:

(JSC::B3::Air::computeCCallingConvention):

• b3/air/AirCode.h:

(JSC::B3::Air::Code::callArgAreaSizeInBytes):
(JSC::B3::Air::Code::requestCallArgAreaSizeInBytes):
(JSC::B3::Air::Code::callArgAreaSize): Deleted.
(JSC::B3::Air::Code::requestCallArgAreaSize): Deleted.

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstruct):
(JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargs):
(JSC::FTL::DFG::LowerDFGToB3::compileCallEval):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/B3Procedure.cpp (modified) (1 diff)
• b3/B3Procedure.h (modified) (1 diff)
• b3/air/AirAllocateStack.cpp (modified) (2 diffs)
• b3/air/AirCCallingConvention.cpp (modified) (1 diff)
• b3/air/AirCode.h (modified) (1 diff)
• ftl/FTLLowerDFGToB3.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-21  Michael Saboff  <msaboff@apple.com>
+
+        FTL needs to reserve callee stack space in bytes
+        https://bugs.webkit.org/show_bug.cgi?id=162324
+
+        Reviewed by Geoffrey Garen.
+
+        Changed two instances where we call B3::Procedure::requestCallArgAreaSize() with the
+        number of JSValue sized objects of stack space instead of bytes.  The correct units
+        to use is bytes.
+
+        Renamed both the Air and B3 related callArgAreaSize() to callArgAreaSizeInBytes().
+
+        No new tests as this doesn't surface as an issue when arguments are passed on the stack.
+
+        * b3/B3Procedure.cpp:
+        (JSC::B3::Procedure::callArgAreaSizeInBytes):
+        (JSC::B3::Procedure::requestCallArgAreaSizeInBytes):
+        (JSC::B3::Procedure::callArgAreaSize): Deleted.
+        (JSC::B3::Procedure::requestCallArgAreaSize): Deleted.
+        * b3/B3Procedure.h:
+        * b3/air/AirAllocateStack.cpp:
+        (JSC::B3::Air::allocateStack):
+        * b3/air/AirCCallingConvention.cpp:
+        (JSC::B3::Air::computeCCallingConvention):
+        * b3/air/AirCode.h:
+        (JSC::B3::Air::Code::callArgAreaSizeInBytes):
+        (JSC::B3::Air::Code::requestCallArgAreaSizeInBytes):
+        (JSC::B3::Air::Code::callArgAreaSize): Deleted.
+        (JSC::B3::Air::Code::requestCallArgAreaSize): Deleted.
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstruct):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargs):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCallEval):
+
 2016-09-21  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/JavaScriptCore/b3/B3Procedure.cpp

@@ -296 +296 @@
 }
 
-unsigned Procedure::callArgAreaSize() const
-{
-    return code().callArgAreaSize();
-}
-
-void Procedure::requestCallArgAreaSize(unsigned size)
-{
-    code().requestCallArgAreaSize(size);
+unsigned Procedure::callArgAreaSizeInBytes() const
+{
+    return code().callArgAreaSizeInBytes();
+}
+
+void Procedure::requestCallArgAreaSizeInBytes(unsigned size)
+{
+    code().requestCallArgAreaSizeInBytes(size);
 }
 

trunk/Source/JavaScriptCore/b3/B3Procedure.h

@@ -211 +211 @@
     Air::Code& code() { return *m_code; }
 
-    unsigned callArgAreaSize() const;
-    void requestCallArgAreaSize(unsigned size);
+    unsigned callArgAreaSizeInBytes() const;
+    void requestCallArgAreaSizeInBytes(unsigned size);
 
     JS_EXPORT_PRIVATE unsigned frameSize() const;

trunk/Source/JavaScriptCore/b3/air/AirAllocateStack.cpp

@@ -241 +241 @@
                     // FIXME: https://bugs.webkit.org/show_bug.cgi?id=150454
                     ASSERT(arg.offset() >= 0);
-                    code.requestCallArgAreaSize(arg.offset() + 8);
+                    code.requestCallArgAreaSizeInBytes(arg.offset() + 8);
                 }
             }
@@ -247 +247 @@
     }
 
-    code.setFrameSize(frameSizeForStackSlots + code.callArgAreaSize());
+    code.setFrameSize(frameSizeForStackSlots + code.callArgAreaSizeInBytes());
 
     // Finally, transform the code to use Addr's instead of StackSlot's. This is a lossless

trunk/Source/JavaScriptCore/b3/air/AirCCallingConvention.cpp

@@ -86 +86 @@
             marshallCCallArgument(gpArgumentCount, fpArgumentCount, stackOffset, value->child(i)));
     }
-    code.requestCallArgAreaSize(WTF::roundUpToMultipleOf(stackAlignmentBytes(), stackOffset));
+    code.requestCallArgAreaSizeInBytes(WTF::roundUpToMultipleOf(stackAlignmentBytes(), stackOffset));
     return result;
 }

trunk/Source/JavaScriptCore/b3/air/AirCode.h

@@ -102 +102 @@
     }
 
-    unsigned callArgAreaSize() const { return m_callArgAreaSize; }
+    unsigned callArgAreaSizeInBytes() const { return m_callArgAreaSize; }
 
     // You can call this before code generation to force a minimum call arg area size.
-    void requestCallArgAreaSize(unsigned size)
+    void requestCallArgAreaSizeInBytes(unsigned size)
     {
         m_callArgAreaSize = std::max(

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -5294 +5294 @@
         LValue jsCallee = lowJSValue(m_graph.varArgChild(node, 0));
 
-        unsigned frameSize = CallFrame::headerSizeInRegisters + numArgs;
-        unsigned alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), frameSize);
+        unsigned frameSize = (CallFrame::headerSizeInRegisters + numArgs) * sizeof(EncodedJSValue);
+        unsigned alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentBytes(), frameSize);
 
         // JS->JS calling convention requires that the caller allows this much space on top of stack to
@@ -5305 +5305 @@
         //   shouldn't rely on Air to infer the trashed stack property based on the arguments it ends
         //   up seeing.
-        m_proc.requestCallArgAreaSize(alignedFrameSize);
+        m_proc.requestCallArgAreaSizeInBytes(alignedFrameSize);
 
         // Collect the arguments, since this can generate code and we want to generate it before we emit
@@ -5555 +5555 @@
             WTF::roundUpToMultipleOf(stackAlignmentBytes(), 5 * sizeof(EncodedJSValue));
 
-        m_proc.requestCallArgAreaSize(minimumJSCallAreaSize);
+        m_proc.requestCallArgAreaSizeInBytes(minimumJSCallAreaSize);
         
         CodeOrigin codeOrigin = codeOriginDescriptionOfCallSite();
@@ -5781 +5781 @@
         LValue jsCallee = lowJSValue(m_graph.varArgChild(node, 0));
         
-        unsigned frameSize = CallFrame::headerSizeInRegisters + numArgs;
-        unsigned alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentRegisters(), frameSize);
-        
-        m_proc.requestCallArgAreaSize(alignedFrameSize);
+        unsigned frameSize = (CallFrame::headerSizeInRegisters + numArgs) * sizeof(EncodedJSValue);
+        unsigned alignedFrameSize = WTF::roundUpToMultipleOf(stackAlignmentBytes(), frameSize);
+        
+        m_proc.requestCallArgAreaSizeInBytes(alignedFrameSize);
         
         Vector<ConstrainedValue> arguments;