Changeset 195876 in webkit

Timestamp:

Jan 29, 2016 6:05:17 PM (8 years ago)

Author:

sbarati@apple.com

Message:

Pack FunctionExecutable and UnlinkedFunctionExecutable harder
​https://bugs.webkit.org/show_bug.cgi?id=153687

Reviewed by Andreas Kling.

This patch reduces FunctionExecutable from 120 to 104 bytes.
This patch reduces UnlinkedFunctionExecutable from 144 to 136 bytes.

• bytecode/ExecutableInfo.h:
• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):

• bytecode/UnlinkedFunctionExecutable.h:
• parser/ParserModes.h:

(JSC::functionNameScopeIsDynamic):

• runtime/Executable.cpp:

(JSC::ScriptExecutable::ScriptExecutable):

• runtime/Executable.h:

(JSC::ScriptExecutable::needsActivation):
(JSC::ScriptExecutable::isArrowFunctionContext):
(JSC::ScriptExecutable::isStrictMode):
(JSC::ScriptExecutable::derivedContextType):
(JSC::ScriptExecutable::ecmaMode):
(JSC::ScriptExecutable::finishCreation):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/ExecutableInfo.h (modified) (1 diff)
• bytecode/UnlinkedFunctionExecutable.cpp (modified) (3 diffs)
• bytecode/UnlinkedFunctionExecutable.h (modified) (5 diffs)
• parser/ParserModes.h (modified) (2 diffs)
• runtime/Executable.cpp (modified) (2 diffs)
• runtime/Executable.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-29  Saam barati  <sbarati@apple.com>
+
+        Pack FunctionExecutable and UnlinkedFunctionExecutable harder
+        https://bugs.webkit.org/show_bug.cgi?id=153687
+
+        Reviewed by Andreas Kling.
+
+        This patch reduces FunctionExecutable from 120 to 104 bytes.
+        This patch reduces UnlinkedFunctionExecutable from 144 to 136 bytes.
+
+        * bytecode/ExecutableInfo.h:
+        * bytecode/UnlinkedFunctionExecutable.cpp:
+        (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+        * bytecode/UnlinkedFunctionExecutable.h:
+        * parser/ParserModes.h:
+        (JSC::functionNameScopeIsDynamic):
+        * runtime/Executable.cpp:
+        (JSC::ScriptExecutable::ScriptExecutable):
+        * runtime/Executable.h:
+        (JSC::ScriptExecutable::needsActivation):
+        (JSC::ScriptExecutable::isArrowFunctionContext):
+        (JSC::ScriptExecutable::isStrictMode):
+        (JSC::ScriptExecutable::derivedContextType):
+        (JSC::ScriptExecutable::ecmaMode):
+        (JSC::ScriptExecutable::finishCreation):
+
 2016-01-29  Saam barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h

@@ -31 +31 @@
 namespace JSC {
     
-enum class DerivedContextType { None, DerivedConstructorContext, DerivedMethodContext };
+enum class DerivedContextType : uint8_t { None, DerivedConstructorContext, DerivedMethodContext };
 
 // FIXME: These flags, ParserModes and propagation to XXXCodeBlocks should be reorganized.

trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp

@@ -81 +81 @@
 UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& source, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode* node, UnlinkedFunctionKind kind, ConstructAbility constructAbility, VariableEnvironment& parentScopeTDZVariables, DerivedContextType derivedContextType)
     : Base(*vm, structure)
-    , m_name(node->ident())
-    , m_inferredName(node->inferredName())
-    , m_sourceOverride(WTFMove(sourceOverride))
     , m_firstLineOffset(node->firstLine() - source.firstLine())
     , m_lineCount(node->lastLine() - node->firstLine())
@@ -95 +92 @@
     , m_typeProfilingEndOffset(node->startStartOffset() + node->source().length() - 1)
     , m_parameterCount(node->parameterCount())
-    , m_parseMode(node->parseMode())
     , m_features(0)
     , m_isInStrictContext(node->isInStrictContext())
@@ -105 +101 @@
     , m_superBinding(static_cast<unsigned>(node->superBinding()))
     , m_derivedContextType(static_cast<unsigned>(derivedContextType))
+    , m_sourceParseMode(static_cast<unsigned>(node->parseMode()))
+    , m_name(node->ident())
+    , m_inferredName(node->inferredName())
+    , m_sourceOverride(WTFMove(sourceOverride))
 {
     ASSERT(m_constructorKind == static_cast<unsigned>(node->constructorKind()));

trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h

@@ -80 +80 @@
     void setNameValue(VM& vm, JSString* nameValue) { m_nameValue.set(vm, this, nameValue); }
     unsigned parameterCount() const { return m_parameterCount; };
-    SourceParseMode parseMode() const { return m_parseMode; };
+    SourceParseMode parseMode() const { return static_cast<SourceParseMode>(m_sourceParseMode); };
     bool isInStrictContext() const { return m_isInStrictContext; }
     FunctionMode functionMode() const { return static_cast<FunctionMode>(m_functionMode); }
@@ -129 +129 @@
     const VariableEnvironment* parentScopeTDZVariables() const { return &m_parentScopeTDZVariables; }
     
-    bool isArrowFunction() const { return m_parseMode == SourceParseMode::ArrowFunctionMode; }
+    bool isArrowFunction() const { return parseMode() == SourceParseMode::ArrowFunctionMode; }
 
     JSC::DerivedContextType derivedContextType() const {return static_cast<JSC::DerivedContextType>(m_derivedContextType); }
@@ -136 +136 @@
     UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, VariableEnvironment&,  JSC::DerivedContextType);
 
-    WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForCall;
-    WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForConstruct;
-
-    Identifier m_name;
-    Identifier m_inferredName;
-    WriteBarrier<JSString> m_nameValue;
-    RefPtr<SourceProvider> m_sourceOverride;
-    VariableEnvironment m_parentScopeTDZVariables;
     unsigned m_firstLineOffset;
     unsigned m_lineCount;
@@ -155 +147 @@
     unsigned m_typeProfilingEndOffset;
     unsigned m_parameterCount;
-    SourceParseMode m_parseMode;
-
     CodeFeatures m_features;
-
     unsigned m_isInStrictContext : 1;
     unsigned m_hasCapturedVariables : 1;
@@ -167 +156 @@
     unsigned m_superBinding : 1;
     unsigned m_derivedContextType: 2;
+    unsigned m_sourceParseMode : 4; // SourceParseMode
+
+    WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForCall;
+    WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForConstruct;
+
+    Identifier m_name;
+    Identifier m_inferredName;
+    WriteBarrier<JSString> m_nameValue;
+    RefPtr<SourceProvider> m_sourceOverride;
+
+    VariableEnvironment m_parentScopeTDZVariables;
 
 protected:

trunk/Source/JavaScriptCore/parser/ParserModes.h

@@ -45 +45 @@
 enum FunctionMode { FunctionExpression, FunctionDeclaration };
 
-enum class SourceParseMode {
+enum class SourceParseMode : uint8_t {
     NormalFunctionMode,
     GeneratorBodyMode,
@@ -146 +146 @@
 }
 
-typedef unsigned CodeFeatures;
+typedef uint16_t CodeFeatures;
 
 const CodeFeatures NoFeatures =                       0;

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -134 +134 @@
 ScriptExecutable::ScriptExecutable(Structure* structure, VM& vm, const SourceCode& source, bool isInStrictContext, DerivedContextType derivedContextType, bool isInArrowFunctionContext)
     : ExecutableBase(vm, structure, NUM_PARAMETERS_NOT_COMPILED)
-    , m_source(source)
     , m_features(isInStrictContext ? StrictModeFeature : 0)
+    , m_didTryToEnterInLoop(false)
     , m_hasCapturedVariables(false)
     , m_neverInline(false)
-    , m_didTryToEnterInLoop(false)
-    , m_derivedContextType(derivedContextType)
+    , m_neverOptimize(false)
     , m_isArrowFunctionContext(isInArrowFunctionContext)
+    , m_derivedContextType(static_cast<unsigned>(derivedContextType))
     , m_overrideLineNumber(-1)
     , m_firstLine(-1)
@@ -148 +148 @@
     , m_typeProfilingStartOffset(UINT_MAX)
     , m_typeProfilingEndOffset(UINT_MAX)
+    , m_source(source)
 {
 }

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -351 +351 @@
     bool isArrowFunctionContext() const { return m_isArrowFunctionContext; }
     bool isStrictMode() const { return m_features & StrictModeFeature; }
-    DerivedContextType derivedContextType() const { return m_derivedContextType; }
+    DerivedContextType derivedContextType() const { return static_cast<DerivedContextType>(m_derivedContextType); }
 
     ECMAMode ecmaMode() const { return isStrictMode() ? StrictMode : NotStrictMode; }
@@ -414 +414 @@
     }
 
-    SourceCode m_source;
     CodeFeatures m_features;
-    bool m_hasCapturedVariables;
-    bool m_neverInline;
-    bool m_neverOptimize { false };
     bool m_didTryToEnterInLoop;
-    DerivedContextType m_derivedContextType;
-    bool m_isArrowFunctionContext;
+    bool m_hasCapturedVariables : 1;
+    bool m_neverInline : 1;
+    bool m_neverOptimize : 1;
+    bool m_isArrowFunctionContext : 1;
+    unsigned m_derivedContextType : 2; // DerivedContextType
+
     int m_overrideLineNumber;
     int m_firstLine;
@@ -429 +429 @@
     unsigned m_typeProfilingStartOffset;
     unsigned m_typeProfilingEndOffset;
+    SourceCode m_source;
 };
 
@@ -700 +701 @@
     friend class ScriptExecutable;
     
+    unsigned m_parametersStartOffset;
     WriteBarrier<UnlinkedFunctionExecutable> m_unlinkedExecutable;
     WriteBarrier<FunctionCodeBlock> m_codeBlockForCall;
     WriteBarrier<FunctionCodeBlock> m_codeBlockForConstruct;
     RefPtr<TypeSet> m_returnStatementTypeSet;
-    unsigned m_parametersStartOffset;
     WriteBarrier<InferredValue> m_singletonFunction;
 };