Changeset 40962 in webkit for trunk/JavaScriptCore/parser/Nodes.cpp

Timestamp:

Feb 12, 2009, 8:10:31 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-02-12 Horia Olaru <​[email protected]>

Reviewed by Oliver Hunt.

​https://bugs.webkit.org/show_bug.cgi?id=23400

When throwing an exception within an eval argument string, the dst parameter was
modified in the functions below and the return value for eval was altered. Changed
the emitNode call in JSC::ThrowNode::emitBytecode to use a temporary register
to store its results instead of dst. The JSC::FunctionCallResolveNode::emitBytecode
would load the function within the dst registry, also altering the result returned
by eval. Replaced it with another temporary.

• parser/Nodes.cpp: (JSC::FunctionCallResolveNode::emitBytecode): (JSC::ThrowNode::emitBytecode):

LayoutTests:

2009-02-12 Horia Olaru <​[email protected]>

Reviewed by Oliver Hunt.

​https://bugs.webkit.org/show_bug.cgi?id=23400

Added a modified version of the test Chris Brichford attached to the bug.
Will test return values of various eval function calls, including some which
throw and catch errors in the string to evaluate.

• fast/js/eval-throw-return-expected.txt: Added.
• fast/js/eval-throw-return.html: Added.
• fast/js/resources/eval-throw-return.js: Added. (throwFunc): (throwOnReturn): (twoFunc):

File:

• trunk/JavaScriptCore/parser/Nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/parser/Nodes.cpp

@@ -641 +641 @@
     }
 
-    RefPtr<RegisterID> func = generator.tempDestination(dst);
+    RefPtr<RegisterID> func = generator.newTemporary();
     RefPtr<RegisterID> thisRegister = generator.newTemporary();
     int identifierStart = divot() - startOffset();
@@ -2294 +2294 @@
     if (dst == generator.ignoredResult())
         dst = 0;
-    RefPtr<RegisterID> expr = generator.emitNode(dst, m_expr.get());
+    RefPtr<RegisterID> expr = generator.emitNode(m_expr.get());
     generator.emitExpressionInfo(divot(), startOffset(), endOffset());
     generator.emitThrow(expr.get());
-    return dst;
+    return 0;
 }