Skip to content

Commit 19e100e

Browse files
committed
update types.Info via astrewrite
1 parent 54bebc3 commit 19e100e

File tree

3 files changed

+141
-64
lines changed

3 files changed

+141
-64
lines changed

compiler/package.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,6 @@ func (pi packageImporter) Import(path string) (*types.Package, error) {
119119
}
120120

121121
func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, importContext *ImportContext, minify bool) (*Archive, error) {
122-
simplifiedFiles := make([]*ast.File, len(files))
123-
for i, file := range files {
124-
simplifiedFiles[i] = astrewrite.Simplify(file, &types.Info{}, false)
125-
}
126-
127122
typesInfo := &types.Info{
128123
Types: make(map[ast.Expr]types.TypeAndValue),
129124
Defs: make(map[*ast.Ident]types.Object),
@@ -150,7 +145,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
150145
previousErr = err
151146
},
152147
}
153-
typesPkg, err := config.Check(importPath, fileSet, simplifiedFiles, typesInfo)
148+
typesPkg, err := config.Check(importPath, fileSet, files, typesInfo)
154149
if importError != nil {
155150
return nil, importError
156151
}
@@ -175,6 +170,11 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
175170
return nil, err
176171
}
177172

173+
simplifiedFiles := make([]*ast.File, len(files))
174+
for i, file := range files {
175+
simplifiedFiles[i] = astrewrite.Simplify(file, typesInfo, false)
176+
}
177+
178178
isBlocking := func(f *types.Func) bool {
179179
archive, err := importContext.Import(f.Pkg().Path())
180180
if err != nil {

0 commit comments

Comments
 (0)