aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Musiol <mail@richard-musiol.de>2018-08-05 18:52:15 +0200
committerRichard Musiol <neelance@gmail.com>2018-08-14 09:19:38 +0000
commit81555cb4f3521b53f9de4ce15f64b77cc9df61b9 (patch)
tree109c9259a842217b04956786476f355b2d825b0c
parent4fc7b93ad7c36b769ef54b4706e6a045d7a8e311 (diff)
downloadgo-81555cb4f3521b53f9de4ce15f64b77cc9df61b9.tar.gz
go-81555cb4f3521b53f9de4ce15f64b77cc9df61b9.zip
cmd/compile/internal/gc: add nil check for closure call on wasm
This commit adds an explicit nil check for closure calls on wasm, so calling a nil func causes a proper panic instead of crashing on the WebAssembly level. Change-Id: I6246844f316677976cdd420618be5664444c25ae Reviewed-on: https://go-review.googlesource.com/127759 Run-TryBot: Richard Musiol <neelance@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Cherry Zhang <cherryyz@google.com>
-rw-r--r--src/cmd/compile/internal/gc/ssa.go4
-rw-r--r--test/closure4.go21
2 files changed, 25 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 553713a1e9..af43da6275 100644
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -3515,6 +3515,10 @@ func (s *state) call(n *Node, k callKind) *ssa.Value {
break
}
closure = s.expr(fn)
+ if thearch.LinkArch.Family == sys.Wasm {
+ // TODO(neelance): On other architectures this should be eliminated by the optimization steps
+ s.nilCheck(closure)
+ }
case OCALLMETH:
if fn.Op != ODOTMETH {
Fatalf("OCALLMETH: n.Left not an ODOTMETH: %v", fn)
diff --git a/test/closure4.go b/test/closure4.go
new file mode 100644
index 0000000000..ec4e0a18eb
--- /dev/null
+++ b/test/closure4.go
@@ -0,0 +1,21 @@
+// run
+
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Check that calling a nil func causes a proper panic.
+
+package main
+
+func main() {
+ defer func() {
+ err := recover()
+ if err == nil {
+ panic("panic expected")
+ }
+ }()
+
+ var f func()
+ f()
+}