Tcl Source Code

Check-in [01e27a732a]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merged fix to bytecode engine problem. Details in merged revision.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 01e27a732a73e1550cb5854d2e79e2ea45806710
User & Date: andreask 2013-05-13 16:59:34
Context
2013-05-14
18:44
make dist check-in: 652c4f2107 user: dgp tags: trunk
12:39
merge trunk check-in: 56cdb9f4ce user: dgp tags: dgp-refactor
2013-05-13
19:30
merge trunk check-in: e1f06628eb user: jan.nijtmans tags: novem
16:59
Merged fix to bytecode engine problem. Details in merged revision. check-in: 01e27a732a user: andreask tags: trunk
16:51
Fixed bug in parent revision [832a1994c7] unpredictably breaking the execution of precompiled byteco... Closed-Leaf check-in: 461dc8b0cc user: andreask tags: bugfix-832a1994c7-for-precompiled-bc
14:23
compiler warning check-in: 49281094f1 user: dgp tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclExecute.c.

2327
2328
2329
2330
2331
2332
2333
2334
2335

2336
2337
2338
2339
2340
2341
2342
	/*
	 * Peephole: do not run INST_START_CMD, just skip it
	 */
	
	iPtr->cmdCount += TclGetUInt4AtPtr(pc+5);
	if (checkInterp) {
	    checkInterp = 0;
	    if ((codePtr->compileEpoch != iPtr->compileEpoch)
		    || (codePtr->nsEpoch != iPtr->varFramePtr->nsPtr->resolverEpoch)) {

		goto instStartCmdFailed;
	    }
	}
	inst = *(pc += 9);
	goto peepholeStart;
    } else if (inst == INST_NOP) {
#ifndef TCL_COMPILE_DEBUG







|
|
>







2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
	/*
	 * Peephole: do not run INST_START_CMD, just skip it
	 */
	
	iPtr->cmdCount += TclGetUInt4AtPtr(pc+5);
	if (checkInterp) {
	    checkInterp = 0;
	    if (((codePtr->compileEpoch != iPtr->compileEpoch) ||
		 (codePtr->nsEpoch != iPtr->varFramePtr->nsPtr->resolverEpoch)) &&
		!(codePtr->flags & TCL_BYTECODE_PRECOMPILED)) {
		goto instStartCmdFailed;
	    }
	}
	inst = *(pc += 9);
	goto peepholeStart;
    } else if (inst == INST_NOP) {
#ifndef TCL_COMPILE_DEBUG