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

Timestamp:

Jul 14, 2005, 11:13:50 AM (20 years ago)

Author:

ggaren

Message:

-fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3970
throw statements fail inside eval statements

Reviewed by mjs.

• kjs/function.cpp: (KJS::GlobalFuncImp::call): Big change since I fixed the tabbing. The important part is: if (c.complType() == Throw) exec->setException(c.value());

• kjs/nodes.cpp: (ThrowNode::execute): removed duplicate KJS_CHECKEXCEPTION (TryNode::execute): try now clears the exception state before the finally block executes, and checks the state after the block executes, so that exceptions in finally code get caught.

• tests/mozilla/expected.html:

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2591 +2591 @@
   KJS_CHECKEXCEPTION
 
-  // bail out on error
-  KJS_CHECKEXCEPTION
-
   return Completion(Throw, v);
 }
@@ -2708 +2705 @@
 
   if (!_catch) {
+    Value lastException = exec->exception();
+    exec->clearException();
+    
     c2 = _final->execute(exec);
+    
+    if (!exec->hadException())
+      exec->setException(lastException);
+    
     return (c2.complType() == Normal) ? c : c2;
   }