merge 8.5

string command of the original, avoiding expensive reconstruction from
the parsed words.

generic/tclBasic.c

@@ -3091,6 +3091,9 @@ CallCommandTraces(
  *	command. This insures that traces get a correct NUL-terminated command
  *	string.
  *
+ *	If 'command' has value (char*)-1, this function calls
+ *	TclGetSrcInfoForCmd() to obtain the source string.  This is used
+ *	to retrieve suitable source strings for bytecode exection.
  *----------------------------------------------------------------------
  */
 
@@ -3102,13 +3105,13 @@ GetCommandSource(
     int objc,
     Tcl_Obj *const objv[])
 {
-    if (!command) {
-	return Tcl_NewListObj(objc, objv);
-    }
     if (command == (char *) -1) {
 	command = TclGetSrcInfoForCmd(iPtr, &numChars);
     }
-    return Tcl_NewStringObj(command, numChars);
+    if (command) {
+	return Tcl_NewStringObj(command, numChars);
+    }
+    return Tcl_NewListObj(objc, objv);
 }
 
 /*
@@ -3605,8 +3608,8 @@ TclEvalObjvInternal(
 				 * for traces. NULL if the string
 				 * representation of the command is unknown is
 				 * to be generated from (objc,objv), -1 if it
-				 * is to be generated from bytecode
-				 * source. This is only needed the traces. */
+				 * is to be generated from bytecode source.
+				 * This is only needed the traces. */
     int length,			/* Number of bytes in command; if -1, all
 				 * characters up to the first null byte are
 				 * used. */

generic/tclExecute.c

@@ -7755,7 +7755,15 @@ TclGetSrcInfoForCmd(
     int *lenPtr)
 {
     CmdFrame *cfPtr = iPtr->cmdFramePtr;
-    ByteCode *codePtr = (ByteCode *) cfPtr->data.tebc.codePtr;
+    ByteCode *codePtr;
+
+    if (!cfPtr) {
+	return NULL;
+    }
+    codePtr = (ByteCode *) cfPtr->data.tebc.codePtr;
+    if (!codePtr || !cfPtr->data.tebc.pc) {
+	return NULL;
+    }
 
     return GetSrcInfoForPc((unsigned char *) cfPtr->data.tebc.pc,
 	    codePtr, lenPtr);

generic/tclNamesp.c

@@ -6241,10 +6241,13 @@ NsEnsembleImplementationCmd(
 
 	/*
 	 * Hand off to the target command.
+	 * [sebres] call from ensemble, use TEBC to retrive command trace 
+	 * from main ensemble.
 	 */
 
-	result = Tcl_EvalObjv(interp, objc-2+prefixObjc, tempObjv,
-		TCL_EVAL_INVOKE);
+	result = TclEvalObjvInternal(interp, objc-2+prefixObjc, tempObjv,
+		/* call from TEBC, TclGetSrcInfoForCmd */(char *) -1, 
+		-1, TCL_EVAL_INVOKE);
 
 	/*
 	 * Clean up.