summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-07-27 20:29:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-07-27 20:29:42 (GMT)
commit83bd34e627b2f9c0c0b5fe3917e82f3428dc9565 (patch)
tree826d164504d73a621e72379ab5694256271b4c28
parent18186af2e6c5db9ce74e112be489bae4147e5c9f (diff)
downloadtcl-83bd34e627b2f9c0c0b5fe3917e82f3428dc9565.zip
tcl-83bd34e627b2f9c0c0b5fe3917e82f3428dc9565.tar.gz
tcl-83bd34e627b2f9c0c0b5fe3917e82f3428dc9565.tar.bz2
Simplify AuxData access with a macro.
-rw-r--r--generic/tclAssembly.c2
-rw-r--r--generic/tclCompile.c1
-rw-r--r--generic/tclCompile.h9
-rw-r--r--tests/subst.test4
4 files changed, 15 insertions, 1 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 6bf2fa8..100e9ef 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -3047,7 +3047,7 @@ ResolveJumpTableTargets(
auxDataIndex = TclGetInt4AtPtr(envPtr->codeStart + bbPtr->jumpOffset + 1);
DEBUG_PRINT("bbPtr = %p jumpOffset = %d auxDataIndex = %d\n",
bbPtr, bbPtr->jumpOffset, auxDataIndex);
- realJumpTablePtr = envPtr->auxDataArrayPtr[auxDataIndex].clientData;
+ realJumpTablePtr = TclFetchAuxData(envPtr, auxDataIndex);
realJumpHashPtr = &realJumpTablePtr->hashTable;
/*
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index e4da2ba..772ce22 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2055,6 +2055,7 @@ TclCompileScript(
#ifdef TCL_COMPILE_DEBUG
/*
* If tracing, print a line for each top level command compiled.
+ * TODO: Suppress when numWords == 0 ?
*/
if ((tclTraceCompile >= 1) && (envPtr->procPtr == NULL)) {
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index 56315db..beb28fd 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1113,6 +1113,15 @@ MODULE_SCOPE Tcl_Obj *TclNewInstNameObj(unsigned char inst);
*----------------------------------------------------------------
*/
+/*
+ * Simplified form to access AuxData.
+ *
+ * ClientData TclFetchAuxData(CompileEng *envPtr, int index);
+ */
+
+#define TclFetchAuxData(envPtr, index) \
+ (envPtr)->auxDataArrayPtr[(index)].clientData
+
#define LITERAL_ON_HEAP 0x01
#define LITERAL_CMD_NAME 0x02
diff --git a/tests/subst.test b/tests/subst.test
index 4be4798..7466895 100644
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -293,6 +293,10 @@ test subst-13.1 {Bug 3081065} -setup {
} -cleanup {
removeFile subst13.tcl
}
+test subst-13.2 {Test for segfault} -body {
+ subst {[}
+} -returnCodes error -result * -match glob
+
# cleanup
::tcltest::cleanupTests