diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2016-01-20 18:07:54 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2016-01-20 18:07:54 (GMT) |
| commit | d8bdd23bc64b9a515924bf2f8c38345a1ee46c0a (patch) | |
| tree | 2400824a648ee497e2ad50c067ac92cf3979d0be | |
| parent | 3168a8c1d98de42ae9e724566ecc16f217252955 (diff) | |
| parent | e3ace88394dd871de573991eab3f5c25f7691cca (diff) | |
| download | tcl-d8bdd23bc64b9a515924bf2f8c38345a1ee46c0a.zip tcl-d8bdd23bc64b9a515924bf2f8c38345a1ee46c0a.tar.gz tcl-d8bdd23bc64b9a515924bf2f8c38345a1ee46c0a.tar.bz2 | |
merge
| -rw-r--r-- | generic/tclCompile.c | 3 | ||||
| -rw-r--r-- | generic/tclExecute.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index e418f68..31dafed 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -913,13 +913,13 @@ TclCleanupByteCode( register ByteCode *codePtr) /* Points to the ByteCode to free. */ { Tcl_Interp *interp = (Tcl_Interp *) *codePtr->interpHandle; - Interp *iPtr = (Interp *) interp; int numLitObjects = codePtr->numLitObjects; int numAuxDataItems = codePtr->numAuxDataItems; register Tcl_Obj **objArrayPtr, *objPtr; register const AuxData *auxDataPtr; int i; #ifdef TCL_COMPILE_STATS +#define iPtr ((Interp *) interp) if (interp != NULL) { ByteCodeStats *statsPtr; @@ -955,6 +955,7 @@ TclCleanupByteCode( } statsPtr->lifetimeCount[log2]++; } +#undef iPtr #endif /* TCL_COMPILE_STATS */ /* diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 7264fd6..cbeaba3 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -9515,15 +9515,11 @@ GetISCInfoForPc( CmdLocation *cmdLocPtr) /* The address of the struct that will hold * the result. */ { - register int pcOffset = (pc - codePtr->codeStart); int numCmds = codePtr->numCommands; unsigned char *codeDeltaNext, *codeLengthNext; unsigned char *srcDeltaNext, *srcLengthNext; int codeOffset, codeLen, srcOffset, srcLen, delta, i; - /* The pc must point within the bytecode */ - assert ((pcOffset >= 0) && (pcOffset < codePtr->numCodeBytes)); - /* * Decode the code and source offset and length for each command. The * next command is the first one whose code starts after pcOffset. In case |