diff options
author | Matthew Dempsky <mdempsky@google.com> | 2021-01-24 17:36:59 -0800 |
---|---|---|
committer | Matthew Dempsky <mdempsky@google.com> | 2021-01-24 17:37:23 -0800 |
commit | 6d8d11876287c86424fd6b33cf5e459e8bfa06fa (patch) | |
tree | 61641e43a23bf1693e111ca9c9785ea54565f90a /src/cmd/compile/internal/noder/import.go | |
parent | 9456804e860ac6e5a60d4e479182d53328069d13 (diff) | |
parent | 063c72f06d8673f3a2a03fd549c61935ca3e5cc5 (diff) | |
download | go-6d8d11876287c86424fd6b33cf5e459e8bfa06fa.tar.gz go-6d8d11876287c86424fd6b33cf5e459e8bfa06fa.zip |
[dev.typeparams] all: merge dev.regabi (063c72f) into dev.typeparams
Eager re-sync-branch to keep Git history reasonably accurate, since
Git lacks a better way of encoding partial merges like CL 286172.
Conflicts:
- src/cmd/compile/internal/inline/inl.go
- src/cmd/compile/internal/noder/import.go
- src/cmd/compile/internal/noder/noder.go
Merge List:
+ 2021-01-25 063c72f06d [dev.regabi] cmd/compile: backport changes from dev.typeparams (9456804)
+ 2021-01-23 d05d6fab32 [dev.regabi] cmd/compile: replace ir.Name map with ir.NameSet for SSA 2
+ 2021-01-23 48badc5fa8 [dev.regabi] cmd/compile: fix escape analysis problem with closures
+ 2021-01-23 51e1819a8d [dev.regabi] cmd/compile: scan body of closure in tooHairy to check for disallowed nodes
Change-Id: I48c0435f7aaf56f4aec26518a7459e9d95a51e9c
Diffstat (limited to 'src/cmd/compile/internal/noder/import.go')
-rw-r--r-- | src/cmd/compile/internal/noder/import.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/noder/import.go b/src/cmd/compile/internal/noder/import.go index aa02c01cff..89a2598833 100644 --- a/src/cmd/compile/internal/noder/import.go +++ b/src/cmd/compile/internal/noder/import.go @@ -176,6 +176,11 @@ func resolveImportPath(path string) (string, error) { // TODO(mdempsky): Return an error instead. func importfile(decl *syntax.ImportDecl) *types.Pkg { + if decl.Path.Kind != syntax.StringLit { + base.Errorf("import path must be a string") + return nil + } + path, err := strconv.Unquote(decl.Path.Value) if err != nil { base.Errorf("import path must be a string") |