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

google · Jan 23, 2024 · a53bdc9 · a53bdc9
1 parent 38d2641
commit a53bdc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
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))
 					}