Changeset 153967 in webkit
- Timestamp:
- Aug 12, 2013 5:28:16 PM (11 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r153965 r153967 1 2013-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 1 20 2013-08-12 Oliver Hunt <oliver@apple.com> 2 21 -
trunk/Source/JavaScriptCore/bytecode/CodeBlock.h
r153963 r153967 665 665 } 666 666 667 void addAdditionalIdentifier(const Identifier& i)668 {669 ASSERT(JITCode::isOptimizingJIT(jitType()));670 return m_jitCode->dfgCommon()->dfgIdentifiers.append(i);671 }672 673 667 const Identifier& identifier(int index) const 674 668 { -
trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.cpp
r153962 r153967 63 63 } 64 64 65 void DesiredIdentifiers::reallyAdd(VM& vm )65 void DesiredIdentifiers::reallyAdd(VM& vm, CommonData* commonData) 66 66 { 67 67 for (unsigned i = 0; i < m_addedIdentifiers.size(); ++i) { 68 68 StringImpl* rep = m_addedIdentifiers[i]; 69 69 ASSERT(rep->hasAtLeastOneRef()); 70 m_codeBlock->addAdditionalIdentifier(Identifier(&vm, rep));70 commonData->dfgIdentifiers.append(Identifier(&vm, rep)); 71 71 } 72 72 } -
trunk/Source/JavaScriptCore/dfg/DFGDesiredIdentifiers.h
r153165 r153967 39 39 namespace DFG { 40 40 41 class CommonData; 42 41 43 class DesiredIdentifiers { 42 44 public: … … 51 53 StringImpl* operator[](unsigned index) const { return at(index); } 52 54 53 void reallyAdd(VM& );55 void reallyAdd(VM&, CommonData*); 54 56 55 57 private: -
trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp
r153460 r153967 272 272 } 273 273 274 void Plan::reallyAdd( )274 void Plan::reallyAdd(CommonData* commonData) 275 275 { 276 276 watchpoints.reallyAdd(); 277 identifiers.reallyAdd(vm );277 identifiers.reallyAdd(vm, commonData); 278 278 } 279 279 … … 292 292 return CompilationFailed; 293 293 294 reallyAdd( );294 reallyAdd(jitCode->dfgCommon()); 295 295 296 296 return CompilationSuccessful; -
trunk/Source/JavaScriptCore/dfg/DFGPlan.h
r153268 r153967 86 86 87 87 bool isStillValid(); 88 void reallyAdd( );88 void reallyAdd(CommonData*); 89 89 }; 90 90
Note: See TracChangeset
for help on using the changeset viewer.