cl: loadImport check recover

goplus · Jun 10, 2022 · 9c87036 · 9c87036
1 parent 9429306
commit 9c87036
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -955,6 +955,13 @@ func simplifyGopPackage(pkgPath string) string {
 }
 
 func loadImport(ctx *blockCtx, spec *ast.ImportSpec) {
+ if enableRecover {
+ defer func() {
+ if e := recover(); e != nil {
+ ctx.handleRecover(e)
+ }
+ }()
+ }
  var pkg *gox.PkgRef
  var pkgPath = toString(spec.Path)
  if realPath, kind := checkC2go(pkgPath); kind != c2goInvalid {

diff --git a/go.mod b/go.mod
@@ -6,6 +6,6 @@ require (
  github.com/goplus/c2go v0.7.7
  github.com/goplus/gox v1.11.10
  github.com/goplus/libc v0.3.9
- github.com/goplus/mod v0.9.10
+ github.com/goplus/mod v0.9.11
  github.com/qiniu/x v1.11.5
 )
diff --git a/go.sum b/go.sum
@@ -8,8 +8,9 @@ github.com/goplus/gox v1.11.10 h1:fayKhbqgrxbD9qylZknDZVvhtSmkMgtxMd0IwXXhTYI=
 github.com/goplus/gox v1.11.10/go.mod h1:gu7fuQF8RmWPZUjd+tEJGuV3m/vOEv0bHrct0x/KatM=
 github.com/goplus/libc v0.3.9 h1:1mZngVccEfPlhVa3iVVY7Z0s6Dm4CbO2OiI5x2z46lg=
 github.com/goplus/libc v0.3.9/go.mod h1:ewlp1FCnlqDNJtkjNi7DikLMVfUcLaABJjL4z7QnkNU=
-github.com/goplus/mod v0.9.10 h1:z7wrTT241dPSGJDeMs5uuqv/5CgXLomhOZGWEAZ+OpE=
 github.com/goplus/mod v0.9.10/go.mod h1:NHU13OjeNV3ez1f+R9FLJIlIun0KNSuZb0jnmP3N3o8=
+github.com/goplus/mod v0.9.11 h1:4u/Icor2tH9AbnETTHG0gx4T1Aodi10mCu/+U3V+WCE=
+github.com/goplus/mod v0.9.11/go.mod h1:NHU13OjeNV3ez1f+R9FLJIlIun0KNSuZb0jnmP3N3o8=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=