Changeset 153967 in webkit


Ignore:
Timestamp:
Aug 12, 2013 5:28:16 PM (11 years ago)
Author:
oliver@apple.com
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:
Location:
trunk/Source/JavaScriptCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r153965 r153967  
     12013-08-12  Oliver Hunt  <oliver@apple.com>
     2
     3        Remove CodeBlock's notion of adding identifiers entirely
     4        https://bugs.webkit.org/show_bug.cgi?id=119708
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Remove addAdditionalIdentifier entirely, including the bogus assertion.
     9        Move the addition of identifiers to DFGPlan::reallyAdd
     10
     11        * bytecode/CodeBlock.h:
     12        * dfg/DFGDesiredIdentifiers.cpp:
     13        (JSC::DFG::DesiredIdentifiers::reallyAdd):
     14        * dfg/DFGDesiredIdentifiers.h:
     15        * dfg/DFGPlan.cpp:
     16        (JSC::DFG::Plan::reallyAdd):
     17        (JSC::DFG::Plan::finalize):
     18        * dfg/DFGPlan.h:
     19
    1202013-08-12  Oliver Hunt  <oliver@apple.com>
    221
  • trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

    r153963 r153967  
    665665    }
    666666
    667     void addAdditionalIdentifier(const Identifier& i)
    668     {
    669         ASSERT(JITCode::isOptimizingJIT(jitType()));
    670         return m_jitCode->dfgCommon()->dfgIdentifiers.append(i);
    671     }
    672 
    673667    const Identifier& identifier(int index) const
    674668    {
  • trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp

    r153962 r153967  
    6363}
    6464
    65 void DesiredIdentifiers::reallyAdd(VM& vm)
     65void DesiredIdentifiers::reallyAdd(VM& vm, CommonData* commonData)
    6666{
    6767    for (unsigned i = 0; i < m_addedIdentifiers.size(); ++i) {
    6868        StringImpl* rep = m_addedIdentifiers[i];
    6969        ASSERT(rep->hasAtLeastOneRef());
    70         m_codeBlock->addAdditionalIdentifier(Identifier(&vm, rep));
     70        commonData->dfgIdentifiers.append(Identifier(&vm, rep));
    7171    }
    7272}
  • trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h

    r153165 r153967  
    3939namespace DFG {
    4040
     41class CommonData;
     42
    4143class DesiredIdentifiers {
    4244public:
     
    5153    StringImpl* operator[](unsigned index) const { return at(index); }
    5254   
    53     void reallyAdd(VM&);
     55    void reallyAdd(VM&, CommonData*);
    5456   
    5557private:
  • trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp

    r153460 r153967  
    272272}
    273273
    274 void Plan::reallyAdd()
     274void Plan::reallyAdd(CommonData* commonData)
    275275{
    276276    watchpoints.reallyAdd();
    277     identifiers.reallyAdd(vm);
     277    identifiers.reallyAdd(vm, commonData);
    278278}
    279279
     
    292292        return CompilationFailed;
    293293   
    294     reallyAdd();
     294    reallyAdd(jitCode->dfgCommon());
    295295   
    296296    return CompilationSuccessful;
  • trunk/Source/JavaScriptCore/dfg/DFGPlan.h

    r153268 r153967  
    8686   
    8787    bool isStillValid();
    88     void reallyAdd();
     88    void reallyAdd(CommonData*);
    8989};
    9090
Note: See TracChangeset for help on using the changeset viewer.