Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/nodes.cpp

    r427 r429  
    16051605        generator.emitJump(handlerEndLabel.get()); 
    16061606        RefPtr<RegisterID> exceptionRegister = generator.emitCatch(generator.newTemporary(), tryStartLabel.get(), tryEndLabel.get()); 
    1607         RefPtr<RegisterID> newScope = generator.emitNewObject(generator.newTemporary()); // scope must be protected until popped 
    1608         generator.emitPutById(newScope.get(), m_exceptionIdent, exceptionRegister.get()); 
    1609         exceptionRegister = 0; // Release register used for temporaries 
    1610         generator.emitPushScope(newScope.get()); 
     1607        generator.emitPushNewScope(exceptionRegister.get(), m_exceptionIdent, exceptionRegister.get()); 
    16111608        generator.emitNode(dst, m_catchBlock.get()); 
    16121609        generator.emitPopScope();