Revert "improve closure thread handling"

This reverts commit 6191293.

There was

Author: apmckinlay

bug_test.go

@@ -1,38 +1,47 @@
 package main
 
-import (
-	"testing"
+// import (
+// 	"testing"
 
-	"github.com/apmckinlay/gsuneido/compile"
-	. "github.com/apmckinlay/gsuneido/core"
-)
+// 	"github.com/apmckinlay/gsuneido/builtin"
+// 	. "github.com/apmckinlay/gsuneido/core"
+// 	"github.com/apmckinlay/gsuneido/util/exit"
+// )
 
-func TestBug(t *testing.T) {
-	Libload = libload // dependency injection
-	MainThread = &mainThread
+// func TestBug(t *testing.T) {
+// 	if testing.Short() {
+// 		t.Skip("skipping test in short mode")
+// 	}
+// 	Libload = libload // dependency injection
+// 	mainThread = &Thread{}
+// 	mainThread.Name = "main"
+// 	mainThread.UIThread = true
+// 	MainThread = mainThread
+// 	builtin.UIThread = mainThread
+// 	exit.Add(func() { mainThread.Close() })
 
-	openDbms()
-	defer db.CloseKeepMapped()
+// 	openDbms()
+// 	defer db.CloseKeepMapped()
 
-	src := `
-		Init.Repl()
-		retryException = 'some exception'
-		count = 0
-		block = { 
-			try  
-				{
-		Print(count, "++")
-				if count++ < 2
-					throw 'case failed: testing'
-		Print('Should see me!!')
-				}
-			catch (err, 'case failed:')
-				{
-				Suneido.X = err
-				throw retryException
-				}
-			}
-		Retry(block, maxRetries: 3, minDelayMs: 100, :retryException)
-		`
-	compile.EvalString(&mainThread, src)
-}
+// 	run(`
+// 		Init.Repl()
+// 		//Use("axonlib")
+// 		//Use("Accountinglib")
+// 		//Use("etalib")
+// 		//Use("pcmiler")
+// 		//Use("ticketlib")
+// 		//Use("prlib")
+// 		//Use("prcadlib")
+// 		//Use("etaprlib")
+// 		//Use("invenlib")
+// 		//Use("wolib")
+// 		//Use("polib")
+// 		//Use("configlib")
+// 		//Use("demobookoptions")
+// 		//Use("Test_lib")
+// 		Print("running...")
+// 		Timer(secs: 60) {
+// 			Qfuzz.MakeQuery()
+// 		}
+// 		`)
+// }

core/interp.go

@@ -614,7 +614,7 @@ loop:
 				parent = fr.blockParent
 			}
 			block := &SuClosure{SuFunc: fn, locals: fr.locals.v, this: fr.this,
-				parent: parent, thread: th}
+				parent: parent}
 			th.Push(block)
 		case op.BlockBreak:
 			panic(BlockBreak)

core/suclosure.go

@@ -19,7 +19,6 @@ type SuClosure struct {
 	locals []Value // if concurrent, then read-only
 	*SuFunc
 	concurrent bool
-	thread     *Thread
 }
 
 // Value interface
@@ -38,7 +37,7 @@ func (b *SuClosure) Call(th *Thread, this Value, as *ArgSpec) Value {
 	bf := b.SuFunc
 
 	v := b.locals
-	if th != b.thread {
+	if b.concurrent {
 		// make a mutable copy of the locals for the frame
 		v = slc.Clone(b.locals)
 	}
@@ -62,16 +61,6 @@ func (b *SuClosure) Call(th *Thread, this Value, as *ArgSpec) Value {
 	fr.this = this
 	fr.blockParent = b.parent
 	fr.locals = locals{v: v, onHeap: true}
-	if th != b.thread {
-		defer func() {
-			for i := range v {
-				if (i < int(b.Offset) || i > int(b.Offset+b.Nparams)) &&
-					v[i] != b.locals[i] {
-					panic("closure changes from other thread")
-				}
-			}
-		}()
-	}
 	return th.run()
 }