Copy the AST before type-checking to avoid concurrency issues (#887)

TristonianJones · web-flow · commit a53bdc97edfa · 2024-01-23T15:05:45.000-08:00
diff --git a/checker/checker.go b/checker/checker.go
@@ -48,10 +48,9 @@ type checker struct {
 // registry.
 func Check(parsed *ast.AST, source common.Source, env *Env) (*ast.AST, *common.Errors) {
 	errs := common.NewErrors(source)
-	typeMap := make(map[int64]*types.Type)
-	refMap := make(map[int64]*ast.ReferenceInfo)
+	checked := ast.Copy(parsed)
 	c := checker{
-		AST:                ast.NewCheckedAST(parsed, typeMap, refMap),
+		AST:                checked,
 		ExprFactory:        ast.NewExprFactory(),
 		env:                env,
 		errors:             &typeErrors{errs: errs},
diff --git a/checker/checker_test.go b/checker/checker_test.go
@@ -2413,7 +2413,7 @@ func TestCheck(t *testing.T) {
 			}
 
 			if tc.out != "" {
-				actualStr := Print(pAst.Expr(), cAst)
+				actualStr := Print(cAst.Expr(), cAst)
 				if !test.Compare(actualStr, tc.out) {
 					t.Error(test.DiffMessage("Structure error", actualStr, tc.out))
 				}
@@ -2504,7 +2504,7 @@ func BenchmarkCheck(b *testing.B) {
 				}
 
 				if tc.out != "" {
-					actualStr := Print(pAst.Expr(), cAst)
+					actualStr := Print(cAst.Expr(), cAst)
 					if !test.Compare(actualStr, tc.out) {
 						b.Error(test.DiffMessage("Structure error", actualStr, tc.out))
 					}

Original file line number	Diff line number	Diff line change
`@@ -2413,7 +2413,7 @@ func TestCheck(t *testing.T) {`
`2413`	`2413`	`}`
`2414`	`2414`
`2415`	`2415`	`if tc.out != "" {`
`2416`		`- actualStr := Print(pAst.Expr(), cAst)`
	`2416`	`+ actualStr := Print(cAst.Expr(), cAst)`
`2417`	`2417`	`if !test.Compare(actualStr, tc.out) {`
`2418`	`2418`	`t.Error(test.DiffMessage("Structure error", actualStr, tc.out))`
`2419`	`2419`	`}`
`@@ -2504,7 +2504,7 @@ func BenchmarkCheck(b *testing.B) {`
`2504`	`2504`	`}`
`2505`	`2505`
`2506`	`2506`	`if tc.out != "" {`
`2507`		`- actualStr := Print(pAst.Expr(), cAst)`
	`2507`	`+ actualStr := Print(cAst.Expr(), cAst)`
`2508`	`2508`	`if !test.Compare(actualStr, tc.out) {`
`2509`	`2509`	`b.Error(test.DiffMessage("Structure error", actualStr, tc.out))`
`2510`	`2510`	`}`