From ebc97113099a3869cdecf6644e1a62ccf79cd4b8 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Jun 2024 04:11:31 +0800 Subject: [PATCH] TestErrImport --- cl/builtin_test.go | 8 ++++++++ cl/compile.go | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cl/builtin_test.go b/cl/builtin_test.go index f5472fe4..de46687e 100644 --- a/cl/builtin_test.go +++ b/cl/builtin_test.go @@ -29,6 +29,7 @@ import ( func TestCollectSkipNames(t *testing.T) { ctx := &context{skips: make(map[string]none)} + ctx.collectSkipNames("//llgo:skipall") ctx.collectSkipNames("//llgo:skip") ctx.collectSkipNames("//llgo:skip abs") } @@ -219,6 +220,13 @@ func TestErrImport(t *testing.T) { var ctx context pkg := types.NewPackage("foo", "foo") ctx.importPkg(pkg, nil) + + alt := types.NewPackage("bar", "bar") + alt.Scope().Insert( + types.NewConst(0, alt, "LLGoPackage", types.Typ[types.String], constant.MakeString("noinit")), + ) + ctx.patches = Patches{"foo": &ssa.Package{Pkg: alt}} + ctx.importPkg(pkg, &pkgInfo{}) } func TestErrInitLinkname(t *testing.T) { diff --git a/cl/compile.go b/cl/compile.go index 4b1e15b3..d3977318 100644 --- a/cl/compile.go +++ b/cl/compile.go @@ -28,7 +28,6 @@ import ( "strings" "github.com/goplus/llgo/cl/blocks" - "github.com/goplus/llgo/internal/packages" "github.com/goplus/llgo/internal/typepatch" llssa "github.com/goplus/llgo/ssa" "golang.org/x/tools/go/ssa" @@ -1022,9 +1021,6 @@ func NewPackageEx(prog llssa.Program, patches Patches, pkg *ssa.Package, files [ pkg.Pkg = pkgTypes alt.Pkg = pkgTypes } - if packages.DebugPackagesLoad { - log.Println("==> NewPackageEx", pkgPath, hasPatch) - } if pkgPath == llssa.PkgRuntime { prog.SetRuntime(pkgTypes) }