Changeset 283903 in webkit for trunk/Source/JavaScriptCore/parser/SourceCode.h

Timestamp:

Oct 11, 2021, 9:58:40 AM (4 years ago)

Author:

[email protected]

Message:

SourceID should have a type name and only be 32-bits
​https://bugs.webkit.org/show_bug.cgi?id=231436

Reviewed by Filip Pizlo.

This patch gives SourceID a proper type name and shrinks it to
32-bits on 64-bit systems. Shrinking the size makes room on
SourceProvider for metadata in a future patch I'm working on.
It's also pretty unlikely that any system has more than ~4 billion
script tags, evals, wasm modules so shinking the size is unlikely
to cause any debugger/profiling issues.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/TypeLocation.h:
• debugger/Debugger.cpp:

(JSC::Debugger::toggleBreakpoint):
(JSC::Debugger::pauseIfNeeded):

• debugger/DebuggerLocation.h:

(JSC::DebuggerLocation::DebuggerLocation):

• debugger/DebuggerPrimitives.h:
• inspector/JavaScriptCallFrame.h:

(Inspector::JavaScriptCallFrame::sourceID const):

• inspector/ScriptCallStackFactory.cpp:

(Inspector::CreateScriptCallStackFunctor::operator() const):
(Inspector::createScriptCallStackFromException):

• interpreter/StackVisitor.cpp:

(JSC::StackVisitor::Frame::sourceID):

• interpreter/StackVisitor.h:
• parser/Nodes.h:

(JSC::ScopeNode::sourceID const):

• parser/SourceCode.h:

(JSC::SourceCode::SourceCode):
(JSC::SourceCode::firstLine const):
(JSC::SourceCode::startColumn const):
(JSC::SourceCode::providerID const):
(JSC::SourceCode::provider const):
(JSC::SourceCode::operator== const):
(JSC::SourceCode::operator!= const):
(JSC::makeSource):
(JSC::SourceCode::subExpression const):

• parser/SourceProvider.cpp:

(JSC::SourceProvider::getID):

• parser/SourceProvider.h:

(JSC::SourceProvider::asID):

• runtime/ControlFlowProfiler.cpp:

(JSC::ControlFlowProfiler::getBasicBlockLocation):
(JSC::ControlFlowProfiler::getBasicBlocksForSourceID const):
(JSC::ControlFlowProfiler::hasBasicBlockAtTextOffsetBeenExecuted):
(JSC::ControlFlowProfiler::basicBlockExecutionCountAtTextOffset):

• runtime/ControlFlowProfiler.h:
• runtime/FunctionHasExecutedCache.cpp:

(JSC::FunctionHasExecutedCache::hasExecutedAtOffset):
(JSC::FunctionHasExecutedCache::insertUnexecutedRange):
(JSC::FunctionHasExecutedCache::removeUnexecutedRange):
(JSC::FunctionHasExecutedCache::getFunctionRanges):

• runtime/FunctionHasExecutedCache.h:
• runtime/SamplingProfiler.cpp:

(JSC::SamplingProfiler::StackFrame::sourceID):

• runtime/SamplingProfiler.h:
• runtime/ScriptExecutable.h:

(JSC::ScriptExecutable::sourceID const):

• runtime/StackFrame.cpp:

(JSC::StackFrame::sourceID const):

• runtime/StackFrame.h:
• runtime/TypeLocationCache.cpp:

(JSC::TypeLocationCache::getTypeLocation):

• runtime/TypeLocationCache.h:
• runtime/TypeProfiler.cpp:

(JSC::TypeProfiler::typeInformationForExpressionAtOffset):
(JSC::TypeProfiler::findLocation):

• runtime/TypeProfiler.h:

(JSC::QueryKey::QueryKey):
(JSC::QueryKey::isHashTableDeletedValue const):

File:

• trunk/Source/JavaScriptCore/parser/SourceCode.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/SourceCode.h

@@ -33 +33 @@
 namespace JSC {
 
-    class SourceCode : public UnlinkedSourceCode {
-        friend class CachedSourceCode;
-        friend class CachedSourceCodeWithoutProvider;
+class SourceCode : public UnlinkedSourceCode {
+    friend class CachedSourceCode;
+    friend class CachedSourceCodeWithoutProvider;
 
-    public:
-        SourceCode()
-            : UnlinkedSourceCode()
-            , m_firstLine(OrdinalNumber::beforeFirst())
-            , m_startColumn(OrdinalNumber::beforeFirst())
-        {
-        }
-
-        SourceCode(Ref<SourceProvider>&& provider)
-            : UnlinkedSourceCode(WTFMove(provider))
-        {
-        }
-
-        SourceCode(Ref<SourceProvider>&& provider, int firstLine, int startColumn)
-            : UnlinkedSourceCode(WTFMove(provider))
-            , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
-            , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
-        {
-        }
-
-        SourceCode(RefPtr<SourceProvider>&& provider, int startOffset, int endOffset, int firstLine, int startColumn)
-            : UnlinkedSourceCode(WTFMove(provider), startOffset, endOffset)
-            , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
-            , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
-        {
-        }
-
-        OrdinalNumber firstLine() const { return m_firstLine; }
-        OrdinalNumber startColumn() const { return m_startColumn; }
-
-        intptr_t providerID() const
-        {
-            if (!m_provider)
-                return SourceProvider::nullID;
-            return m_provider->asID();
-        }
-
-        SourceProvider* provider() const { return m_provider.get(); }
-
-        SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn) const;
-
-        bool operator==(const SourceCode& other) const
-        {
-            return m_firstLine == other.m_firstLine
-                && m_startColumn == other.m_startColumn
-                && m_provider == other.m_provider
-                && m_startOffset == other.m_startOffset
-                && m_endOffset == other.m_endOffset;
-        }
-
-        bool operator!=(const SourceCode& other) const
-        {
-            return !(*this == other);
-        }
-
-    private:
-        OrdinalNumber m_firstLine;
-        OrdinalNumber m_startColumn;
-    };
-
-    inline SourceCode makeSource(const String& source, const SourceOrigin& sourceOrigin, String filename = String(), const TextPosition& startPosition = TextPosition(), SourceProviderSourceType sourceType = SourceProviderSourceType::Program)
+public:
+    SourceCode()
+        : UnlinkedSourceCode()
+        , m_firstLine(OrdinalNumber::beforeFirst())
+        , m_startColumn(OrdinalNumber::beforeFirst())
     {
-        return SourceCode(StringSourceProvider::create(source, sourceOrigin, WTFMove(filename), startPosition, sourceType), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
-    }
-    
-    inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn) const
-    {
-        startColumn += 1; // Convert to base 1.
-        return SourceCode(RefPtr<SourceProvider> { provider() }, openBrace, closeBrace + 1, firstLine, startColumn);
     }
 
+    SourceCode(Ref<SourceProvider>&& provider)
+        : UnlinkedSourceCode(WTFMove(provider))
+    {
+    }
+
+    SourceCode(Ref<SourceProvider>&& provider, int firstLine, int startColumn)
+        : UnlinkedSourceCode(WTFMove(provider))
+        , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
+        , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
+    {
+    }
+
+    SourceCode(RefPtr<SourceProvider>&& provider, int startOffset, int endOffset, int firstLine, int startColumn)
+        : UnlinkedSourceCode(WTFMove(provider), startOffset, endOffset)
+        , m_firstLine(OrdinalNumber::fromOneBasedInt(std::max(firstLine, 1)))
+        , m_startColumn(OrdinalNumber::fromOneBasedInt(std::max(startColumn, 1)))
+    {
+    }
+
+    OrdinalNumber firstLine() const { return m_firstLine; }
+    OrdinalNumber startColumn() const { return m_startColumn; }
+
+    SourceID providerID() const
+    {
+        if (!m_provider)
+            return SourceProvider::nullID;
+        return m_provider->asID();
+    }
+
+    SourceProvider* provider() const { return m_provider.get(); }
+
+    SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn) const;
+
+    bool operator==(const SourceCode& other) const
+    {
+        return m_firstLine == other.m_firstLine
+            && m_startColumn == other.m_startColumn
+            && m_provider == other.m_provider
+            && m_startOffset == other.m_startOffset
+            && m_endOffset == other.m_endOffset;
+    }
+
+    bool operator!=(const SourceCode& other) const
+    {
+        return !(*this == other);
+    }
+
+private:
+    OrdinalNumber m_firstLine;
+    OrdinalNumber m_startColumn;
+};
+
+inline SourceCode makeSource(const String& source, const SourceOrigin& sourceOrigin, String filename = String(), const TextPosition& startPosition = TextPosition(), SourceProviderSourceType sourceType = SourceProviderSourceType::Program)
+{
+    return SourceCode(StringSourceProvider::create(source, sourceOrigin, WTFMove(filename), startPosition, sourceType), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
+}
+
+inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn) const
+{
+    startColumn += 1; // Convert to base 1.
+    return SourceCode(RefPtr<SourceProvider> { provider() }, openBrace, closeBrace + 1, firstLine, startColumn);
+}
+
 } // namespace JSC