Ignore:
Timestamp:
Dec 19, 2011, 11:36:37 AM (13 years ago)
Author:
[email protected]
Message:

Rolling r103120 back in with merge errors corrected.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/dfg/DFGNode.h

    r103218 r103250  
    227227    /* this must be the directly subsequent property put. */\
    228228    macro(GetByVal, NodeResultJS | NodeMustGenerate | NodeMightClobber) \
    229     macro(PutByVal, NodeMustGenerate | NodeClobbersWorld) \
    230     macro(PutByValAlias, NodeMustGenerate | NodeClobbersWorld) \
     229    macro(PutByVal, NodeMustGenerate | NodeClobbersWorld | NodeHasVarArgs) \
     230    macro(PutByValAlias, NodeMustGenerate | NodeClobbersWorld | NodeHasVarArgs) \
    231231    macro(GetById, NodeResultJS | NodeMustGenerate | NodeClobbersWorld) \
    232232    macro(PutById, NodeMustGenerate | NodeClobbersWorld) \
     
    235235    macro(PutStructure, NodeMustGenerate | NodeClobbersWorld) \
    236236    macro(GetPropertyStorage, NodeResultStorage) \
    237     macro(GetIndexedPropertyStorage, NodeMustGenerate | NodeResultStorage) \
     237    macro(GetIndexedPropertyStorage, NodeResultStorage) \
    238238    macro(GetByOffset, NodeResultJS) \
    239239    macro(PutByOffset, NodeMustGenerate | NodeClobbersWorld) \
Note: See TracChangeset for help on using the changeset viewer.