Changeset 35533 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Aug 3, 2008, 2:58:21 AM (17 years ago)

Author:

[email protected]

Message:

Bug 19359: JavaScriptCore behaves differently from FF2/3 and IE when handling context in catch statement
<​https://bugs.webkit.org/show_bug.cgi?id=19359>

Reviewed by Cameron Zwarich

Make our catch behave like Firefox and IE, we do this by using a StaticScopeObject
instead of a generic JSObject for the scope node. We still don't make use of the
fact that we have a static scope inside the catch block, so the internal performance
of the catch block is not improved, even though technically it would be possible to
do so.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1605 +1605 @@
         generator.emitJump(handlerEndLabel.get());
         RefPtr<RegisterID> exceptionRegister = generator.emitCatch(generator.newTemporary(), tryStartLabel.get(), tryEndLabel.get());
-        RefPtr<RegisterID> newScope = generator.emitNewObject(generator.newTemporary()); // scope must be protected until popped
-        generator.emitPutById(newScope.get(), m_exceptionIdent, exceptionRegister.get());
-        exceptionRegister = 0; // Release register used for temporaries
-        generator.emitPushScope(newScope.get());
+        generator.emitPushNewScope(exceptionRegister.get(), m_exceptionIdent, exceptionRegister.get());
         generator.emitNode(dst, m_catchBlock.get());
         generator.emitPopScope();