From 163c13b1f004afa81c6aaa1fdc93a95ca319cebd Mon Sep 17 00:00:00 2001
From: Miguel Sofer <miguel.sofer@gmail.com>
Date: Tue, 5 Aug 2008 15:52:23 +0000
Subject: 	* generic/tclExecute.c: Fix for [Bug 2038069] by dgp. 	*
 tests/execute.test:

---
 generic/tclExecute.c |  5 +++--
 tests/execute.test   | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 5d33e3c..87695ba 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclExecute.c,v 1.397 2008/08/04 18:32:29 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.398 2008/08/05 15:52:23 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -2712,7 +2712,8 @@ TclExecuteByteCode(
 
 	    DECACHE_STACK_INFO();
 
-	    result = TclNREvalObjv(interp, objc, objv, TCL_EVAL_NOERR, NULL);
+	    result = TclNREvalObjv(interp, objc, objv,
+		    (*pc == INST_EVAL_STK) ? 0 : TCL_EVAL_NOERR, NULL);
 	    result = TclNRRunCallbacks(interp, result, bottomPtr->rootPtr, 1);
 	    CACHE_STACK_INFO();
 
diff --git a/tests/execute.test b/tests/execute.test
index 6c34dc1..d9f02e0 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -14,7 +14,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: execute.test,v 1.28 2008/08/04 04:49:24 dgp Exp $
+# RCS: @(#) $Id: execute.test,v 1.29 2008/08/05 15:52:24 msofer Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -958,6 +958,21 @@ test execute-8.4 {Compile epoch bump effect on stack trace} -setup {
     rename FOO {}
 } -result {}
 
+test execute-8.5 {Bug 2038069} -setup {
+    proc demo {} {
+	catch [list error FOO] m o
+	return $o
+    }
+} -body {
+    demo
+} -cleanup {
+    rename demo {}
+} -result {-code 1 -level 0 -errorcode NONE -errorinfo {FOO
+    while executing
+"error FOO"
+    invoked from within
+"catch [list error FOO] m o"} -errorline 2}
+
 test execute-9.1 {Interp result resetting [Bug 1522803]} {
     set c 0
     catch {
-- 
cgit v0.12