Revert performance optimization as first step to providing a refactored one.

1 files changed, 1 insertions, 24 deletions

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 30ef536..cfcdd26 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2685,34 +2685,11 @@ TEBCresume(
 
 	opnd = TclGetUInt1AtPtr(pc+1);
 
-	objv = &OBJ_AT_DEPTH(opnd-1);
-	/* minor optimization in simplest cases */
-	switch (opnd) {
-	case 1: /* only one object */
-	    objResultPtr = *objv;
-	    goto endINST_STR_CONCAT1;
-	case 2: /* two objects - check empty */
-	    if (objv[0]->bytes == &tclEmptyString) {
-		objResultPtr = objv[1];
-		goto endINST_STR_CONCAT1;
-	    }
-	    else
-	    if (objv[1]->bytes == &tclEmptyString) {
-		objResultPtr = objv[0];
-		goto endINST_STR_CONCAT1;
-	    }
-	    break;
-	case 0: /* no objects - use new empty */
-	    TclNewObj(objResultPtr);
-	    goto endINST_STR_CONCAT1;
-	}
-	/* do concat */
 	if (TCL_OK != TclStringCatObjv(interp, /* inPlace */ 1,
-		opnd, objv, &objResultPtr)) {
+		opnd, &OBJ_AT_DEPTH(opnd-1), &objResultPtr)) {
 	    TRACE_ERROR(interp);
 	    goto gotError;
 	}
-      endINST_STR_CONCAT1:
 
 	TRACE_WITH_OBJ(("%u => ", opnd), objResultPtr);
 	NEXT_INST_V(2, opnd, 1);