@@ -119,11 +119,6 @@ func (pi packageImporter) Import(path string) (*types.Package, error) {
119
119
}
120
120
121
121
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
-
127
122
typesInfo := & types.Info {
128
123
Types : make (map [ast.Expr ]types.TypeAndValue ),
129
124
Defs : make (map [* ast.Ident ]types.Object ),
@@ -150,7 +145,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
150
145
previousErr = err
151
146
},
152
147
}
153
- typesPkg , err := config .Check (importPath , fileSet , simplifiedFiles , typesInfo )
148
+ typesPkg , err := config .Check (importPath , fileSet , files , typesInfo )
154
149
if importError != nil {
155
150
return nil , importError
156
151
}
@@ -175,6 +170,11 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
175
170
return nil , err
176
171
}
177
172
173
+ simplifiedFiles := make ([]* ast.File , len (files ))
174
+ for i , file := range files {
175
+ simplifiedFiles [i ] = astrewrite .Simplify (file , typesInfo , false )
176
+ }
177
+
178
178
isBlocking := func (f * types.Func ) bool {
179
179
archive , err := importContext .Import (f .Pkg ().Path ())
180
180
if err != nil {
0 commit comments