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

Log Message

Remove CodeBlock's notion of adding identifiers entirely
https://bugs.webkit.org/show_bug.cgi?id=119708

Reviewed by Geoffrey Garen.

Remove addAdditionalIdentifier entirely, including the bogus assertion.
Move the addition of identifiers to DFGPlan::reallyAdd

* bytecode/CodeBlock.h:
* dfg/DFGDesiredIdentifiers.cpp:
(JSC::DFG::DesiredIdentifiers::reallyAdd):
* dfg/DFGDesiredIdentifiers.h:
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::reallyAdd):
(JSC::DFG::Plan::finalize):
* dfg/DFGPlan.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (153966 => 153967)


--- trunk/Source/_javascript_Core/ChangeLog	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-08-13 00:28:16 UTC (rev 153967)
@@ -1,5 +1,24 @@
 2013-08-12  Oliver Hunt  <[email protected]>
 
+        Remove CodeBlock's notion of adding identifiers entirely
+        https://bugs.webkit.org/show_bug.cgi?id=119708
+
+        Reviewed by Geoffrey Garen.
+
+        Remove addAdditionalIdentifier entirely, including the bogus assertion.
+        Move the addition of identifiers to DFGPlan::reallyAdd
+
+        * bytecode/CodeBlock.h:
+        * dfg/DFGDesiredIdentifiers.cpp:
+        (JSC::DFG::DesiredIdentifiers::reallyAdd):
+        * dfg/DFGDesiredIdentifiers.h:
+        * dfg/DFGPlan.cpp:
+        (JSC::DFG::Plan::reallyAdd):
+        (JSC::DFG::Plan::finalize):
+        * dfg/DFGPlan.h:
+
+2013-08-12  Oliver Hunt  <[email protected]>
+
         Build fix
 
         * runtime/JSCell.h:

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.h (153966 => 153967)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.h	2013-08-13 00:28:16 UTC (rev 153967)
@@ -664,12 +664,6 @@
         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();

Modified: trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.cpp (153966 => 153967)


--- trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.cpp	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.cpp	2013-08-13 00:28:16 UTC (rev 153967)
@@ -62,12 +62,12 @@
     return result;
 }
 
-void DesiredIdentifiers::reallyAdd(VM& vm)
+void DesiredIdentifiers::reallyAdd(VM& vm, CommonData* commonData)
 {
     for (unsigned i = 0; i < m_addedIdentifiers.size(); ++i) {
         StringImpl* rep = m_addedIdentifiers[i];
         ASSERT(rep->hasAtLeastOneRef());
-        m_codeBlock->addAdditionalIdentifier(Identifier(&vm, rep));
+        commonData->dfgIdentifiers.append(Identifier(&vm, rep));
     }
 }
 

Modified: trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.h (153966 => 153967)


--- trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.h	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/dfg/DFGDesiredIdentifiers.h	2013-08-13 00:28:16 UTC (rev 153967)
@@ -38,6 +38,8 @@
 
 namespace DFG {
 
+class CommonData;
+
 class DesiredIdentifiers {
 public:
     DesiredIdentifiers(CodeBlock*);
@@ -50,7 +52,7 @@
     
     StringImpl* operator[](unsigned index) const { return at(index); }
     
-    void reallyAdd(VM&);
+    void reallyAdd(VM&, CommonData*);
     
 private:
     CodeBlock* m_codeBlock;

Modified: trunk/Source/_javascript_Core/dfg/DFGPlan.cpp (153966 => 153967)


--- trunk/Source/_javascript_Core/dfg/DFGPlan.cpp	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/dfg/DFGPlan.cpp	2013-08-13 00:28:16 UTC (rev 153967)
@@ -271,10 +271,10 @@
         && chains.areStillValid();
 }
 
-void Plan::reallyAdd()
+void Plan::reallyAdd(CommonData* commonData)
 {
     watchpoints.reallyAdd();
-    identifiers.reallyAdd(vm);
+    identifiers.reallyAdd(vm, commonData);
 }
 
 CompilationResult Plan::finalize(RefPtr<JSC::JITCode>& jitCode, MacroAssemblerCodePtr* jitCodeWithArityCheck)
@@ -291,7 +291,7 @@
     if (!result)
         return CompilationFailed;
     
-    reallyAdd();
+    reallyAdd(jitCode->dfgCommon());
     
     return CompilationSuccessful;
 }

Modified: trunk/Source/_javascript_Core/dfg/DFGPlan.h (153966 => 153967)


--- trunk/Source/_javascript_Core/dfg/DFGPlan.h	2013-08-13 00:20:47 UTC (rev 153966)
+++ trunk/Source/_javascript_Core/dfg/DFGPlan.h	2013-08-13 00:28:16 UTC (rev 153967)
@@ -85,7 +85,7 @@
     CompilationPath compileInThreadImpl(LongLivedState&);
     
     bool isStillValid();
-    void reallyAdd();
+    void reallyAdd(CommonData*);
 };
 
 #else // ENABLE(DFG_JIT)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to