Title: [153963] trunk/Source/_javascript_Core
Revision
153963
Author
[email protected]
Date
2013-08-12 16:41:26 -0700 (Mon, 12 Aug 2013)

Log Message

Move additionalIdentifiers into DFGCommonData as only the optimising JITs use them
https://bugs.webkit.org/show_bug.cgi?id=119705

Reviewed by Geoffrey Garen.

Relatively trivial refactoring

* bytecode/CodeBlock.h:
(JSC::CodeBlock::numberOfAdditionalIdentifiers):
(JSC::CodeBlock::addAdditionalIdentifier):
(JSC::CodeBlock::identifier):
(JSC::CodeBlock::numberOfIdentifiers):
* dfg/DFGCommonData.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (153962 => 153963)


--- trunk/Source/_javascript_Core/ChangeLog	2013-08-12 22:39:13 UTC (rev 153962)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-08-12 23:41:26 UTC (rev 153963)
@@ -1,5 +1,21 @@
 2013-08-12  Oliver Hunt  <[email protected]>
 
+        Move additionalIdentifiers into DFGCommonData as only the optimising JITs use them
+        https://bugs.webkit.org/show_bug.cgi?id=119705
+
+        Reviewed by Geoffrey Garen.
+
+        Relatively trivial refactoring
+
+        * bytecode/CodeBlock.h:
+        (JSC::CodeBlock::numberOfAdditionalIdentifiers):
+        (JSC::CodeBlock::addAdditionalIdentifier):
+        (JSC::CodeBlock::identifier):
+        (JSC::CodeBlock::numberOfIdentifiers):
+        * dfg/DFGCommonData.h:
+
+2013-08-12  Oliver Hunt  <[email protected]>
+
         Stop making unnecessary copy of CodeBlock Identifier Vector
         https://bugs.webkit.org/show_bug.cgi?id=119702
 

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (153962 => 153963)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-08-12 22:39:13 UTC (rev 153962)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-08-12 23:41:26 UTC (rev 153963)
@@ -654,17 +654,34 @@
 #endif
 
     // Constant Pool
+#if ENABLE(DFG_JIT)
+    size_t numberOfIdentifiers() const { return m_unlinkedCode->numberOfIdentifiers() + numberOfDFGIdentifiers(); }
+    size_t numberOfDFGIdentifiers() const
+    {
+        if (!JITCode::isOptimizingJIT(jitType()))
+            return 0;
 
-    size_t numberOfIdentifiers() const { return m_unlinkedCode->numberOfIdentifiers() + numberOfAdditionalIdentifiers(); }
-    size_t numberOfAdditionalIdentifiers() const { return m_additionalIdentifiers.size(); }
-    void addAdditionalIdentifier(const Identifier& i) { return m_additionalIdentifiers.append(i); }
+        return m_jitCode->dfgCommon()->dfgIdentifiers.size();
+    }
+
+    void addAdditionalIdentifier(const Identifier& i)
+    {
+        ASSERT(JITCode::isOptimizingJIT(jitType()));
+        return m_jitCode->dfgCommon()->dfgIdentifiers.append(i);
+    }
+
     const Identifier& identifier(int index) const
     {
         size_t unlinkedIdentifiers = m_unlinkedCode->numberOfIdentifiers();
         if (static_cast<unsigned>(index) < unlinkedIdentifiers)
             return m_unlinkedCode->identifier(index);
-        return m_additionalIdentifiers[index - unlinkedIdentifiers];
+        ASSERT(JITCode::isOptimizingJIT(jitType()));
+        return m_jitCode->dfgCommon()->dfgIdentifiers[index - unlinkedIdentifiers];
     }
+#else
+    size_t numberOfIdentifiers() const { return m_unlinkedCode->numberOfIdentifiers(); }
+    const Identifier& identifier(int index) const { return m_unlinkedCode->identifier(index); }
+#endif
 
     size_t numberOfConstantRegisters() const { return m_constantRegisters.size(); }
     unsigned addConstant(JSValue v)

Modified: trunk/Source/_javascript_Core/dfg/DFGCommonData.h (153962 => 153963)


--- trunk/Source/_javascript_Core/dfg/DFGCommonData.h	2013-08-12 22:39:13 UTC (rev 153962)
+++ trunk/Source/_javascript_Core/dfg/DFGCommonData.h	2013-08-12 23:41:26 UTC (rev 153963)
@@ -37,6 +37,7 @@
 namespace JSC {
 
 class CodeBlock;
+class Identifier;
 
 namespace DFG {
 
@@ -73,7 +74,8 @@
     void notifyCompilingStructureTransition(CodeBlock*, Node*);
     
     void shrinkToFit();
-    
+
+    Vector<Identifier> dfgIdentifiers;
     Vector<WeakReferenceTransition> transitions;
     Vector<WriteBarrier<JSCell> > weakReferences;
     
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to