From 6beda912ab0f8bd8784d7b1a973d3897c89b75c0 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 27 Oct 2016 20:06:36 +0000
Subject: Convert INST_STR_CONCAT1 to the common `string cat` implementation.

---
 generic/tclExecute.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index b19754e..fcf5ba9 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2692,6 +2692,13 @@ TEBCresume(
 
 	opnd = TclGetUInt1AtPtr(pc+1);
 
+#if 1
+	if (TCL_OK != TclStringCatObjv(interp, opnd, &OBJ_AT_DEPTH(opnd-1),
+		&objResultPtr)) {
+	    TRACE_ERROR(interp);
+	    goto gotError;
+	}
+#else
 	/*
 	 * Detect only-bytearray-or-null case.
 	 */
@@ -2828,6 +2835,7 @@ TEBCresume(
 		}
 	    }
 	}
+#endif
 
 	TRACE_WITH_OBJ(("%u => ", opnd), objResultPtr);
 	NEXT_INST_V(2, opnd, 1);
-- 
cgit v0.12