Changeset 209353 in webkit for trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp

Timestamp:

Dec 5, 2016, 2:46:06 PM (9 years ago)

Author:

[email protected]

Message:

ScriptExecutable should not contain a copy of firstLine and startColumn
​https://bugs.webkit.org/show_bug.cgi?id=165415

Reviewed by Keith Miller.

We already have this data in SourceCode.

It's super confusing to have two copies of this data, where one is
allowed to mutate. In reality, your line and column number never change.

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::link):

• runtime/CodeCache.cpp:

(JSC::CodeCache::getUnlinkedGlobalCodeBlock):

• runtime/CodeCache.h:

(JSC::generateUnlinkedCodeBlock):

• runtime/FunctionExecutable.cpp:

(JSC::FunctionExecutable::FunctionExecutable):

• runtime/FunctionExecutable.h:
• runtime/ScriptExecutable.cpp:

(JSC::ScriptExecutable::ScriptExecutable):
(JSC::ScriptExecutable::newCodeBlockFor):

• runtime/ScriptExecutable.h:

(JSC::ScriptExecutable::firstLine):
(JSC::ScriptExecutable::startColumn):
(JSC::ScriptExecutable::recordParse):

File:

• trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/ScriptExecutable.cpp

@@ -58 +58 @@
     , m_evalContextType(static_cast<unsigned>(evalContextType))
     , m_overrideLineNumber(-1)
-    , m_firstLine(-1)
     , m_lastLine(-1)
-    , m_startColumn(UINT_MAX)
     , m_endColumn(UINT_MAX)
     , m_typeProfilingStartOffset(UINT_MAX)
@@ -179 +177 @@
 
     ASSERT(vm->heap.isDeferred());
-    ASSERT(startColumn() != UINT_MAX);
     ASSERT(endColumn() != UINT_MAX);
 
@@ -199 +196 @@
         return ProgramCodeBlock::create(vm,
             executable, executable->m_unlinkedProgramCodeBlock.get(), scope,
-            executable->source().provider(), executable->source().startColumn());
+            executable->source().provider(), startColumn());
     }
 
@@ -209 +206 @@
         return ModuleProgramCodeBlock::create(vm,
             executable, executable->m_unlinkedModuleProgramCodeBlock.get(), scope,
-            executable->source().provider(), executable->source().startColumn());
+            executable->source().provider(), startColumn());
     }
 
@@ -225 +222 @@
     recordParse(
         executable->m_unlinkedExecutable->features(), 
-        executable->m_unlinkedExecutable->hasCapturedVariables(), firstLine(), 
-        lastLine(), startColumn(), endColumn()); 
+        executable->m_unlinkedExecutable->hasCapturedVariables(),
+        lastLine(), endColumn()); 
     if (!unlinkedCodeBlock) {
         exception = throwException(
@@ -234 +231 @@
     }
 
-    SourceProvider* provider = executable->source().provider();
-    unsigned sourceOffset = executable->source().startOffset();
-    unsigned startColumn = executable->source().startColumn();
-
-    return FunctionCodeBlock::create(vm,
-        executable, unlinkedCodeBlock, scope, provider, sourceOffset, startColumn);
+    return FunctionCodeBlock::create(vm, executable, unlinkedCodeBlock, scope, 
+        source().provider(), source().startOffset(), startColumn());
 }