From 352f9db6131a948693af4acd7d5ae471c54635c2 Mon Sep 17 00:00:00 2001 From: Miguel Sofer Date: Sat, 22 Oct 2005 03:07:45 +0000 Subject: * generic/tclExecute.c (INST_CONCAT): disable the optimisation for wide integers, [Bug 1251791]. --- ChangeLog | 5 +++++ generic/tclExecute.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5353cdc..095edc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-22 Miguel Sofer + + * generic/tclExecute.c (INST_CONCAT): disable the optimisation for + wide integers, [Bug 1251791]. + 2005-10-14 Zoran Vasiljevic * generic/tclIO.c (Tcl_ClearChannelHandlers): removed diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 5161b17..ef4b7d4 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -11,7 +11,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.94.2.14 2005/08/29 16:37:42 kennykb Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.94.2.15 2005/10/22 03:07:45 msofer Exp $ */ #include "tclInt.h" @@ -1265,10 +1265,12 @@ TclExecuteByteCode(interp, codePtr) /* * Peephole optimisation for appending an empty string. * This enables replacing 'K $x [set x{}]' by '$x[set x{}]' - * for fastest execution. + * for fastest execution. Avoid doing the optimisation for wide + * ints - a case where equal strings may refer to different values + * (see [Bug 1251791]). */ - if (opnd == 2) { + if ((opnd == 2) && (stackPtr[stackTop-1]->typePtr != &tclWideIntType)) { Tcl_GetStringFromObj(stackPtr[stackTop], &length); if (length == 0) { /* Just drop the top item from the stack */ -- cgit v0.12