initDepPkgs fix: allow pubName not found

goplus · Jul 23, 2022 · 8c6a367 · 8c6a367
1 parent 3d3e43d
commit 8c6a367
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cl/multifiles.go b/cl/multifiles.go
@@ -196,9 +196,10 @@ func initDepPkgs(pkg *gox.Package, deps *depPkgs) {
  for _, dep := range deps.pkgs {
  depPkg := pkg.Import(dep.path)
  for _, pub := range dep.pubs {
- obj := depPkg.Ref(pub.goName)
- if old := scope.Insert(gox.NewSubst(token.NoPos, pkg.Types, pub.name, obj)); old != nil {
- log.Panicf("conflicted name `%v` in %v, previous definition is %v\n", pub.name, dep.path, old)
+ if obj := depPkg.TryRef(pub.goName); obj != nil {
+ if old := scope.Insert(gox.NewSubst(token.NoPos, pkg.Types, pub.name, obj)); old != nil {
+ log.Panicf("conflicted name `%v` in %v, previous definition is %v\n", pub.name, dep.path, old)
+ }
  }
  }
  }

diff --git a/testdata/libc/src/foo.h b/testdata/libc/src/foo.h
@@ -10,3 +10,4 @@ typedef struct {
 typedef size_t foo_t;
 
 foo_t foo();
+void unknown();