summaryrefslogtreecommitdiff
path: root/src/runtime/mfinal.go
diff options
context:
space:
mode:
authorKeith Randall <khr@golang.org>2016-10-28 11:37:45 -0700
committerKeith Randall <khr@golang.org>2016-11-02 21:33:03 +0000
commit688995d1e91fcc36ac33bf34d6303e935d1b0a70 (patch)
tree55ea9a066877ee5a8e80b5ea3f80135f75d6d6b2 /src/runtime/mfinal.go
parent761443edd56832cc1b62f9193f157ca822dfa09e (diff)
downloadgo-git-688995d1e91fcc36ac33bf34d6303e935d1b0a70.tar.gz
cmd/compile: do more type conversion inline
The code to do the conversion is smaller than the call to the runtime. The 1-result asserts need to call panic if they fail, but that code is out of line. The only conversions left in the runtime are those which might allocate and those which might need to generate an itab. Given the following types: type E interface{} type I interface { foo() } type I2 iterface { foo(); bar() } type Big [10]int func (b Big) foo() { ... } This CL inlines the following conversions: was assertE2T var e E = ... b := i.(Big) was assertE2T2 var e E = ... b, ok := i.(Big) was assertI2T var i I = ... b := i.(Big) was assertI2T2 var i I = ... b, ok := i.(Big) was assertI2E var i I = ... e := i.(E) was assertI2E2 var i I = ... e, ok := i.(E) These are the remaining runtime calls: convT2E: var b Big = ... var e E = b convT2I: var b Big = ... var i I = b convI2I: var i2 I2 = ... var i I = i2 assertE2I: var e E = ... i := e.(I) assertE2I2: var e E = ... i, ok := e.(I) assertI2I: var i I = ... i2 := i.(I2) assertI2I2: var i I = ... i2, ok := i.(I2) Fixes #17405 Fixes #8422 Change-Id: Ida2367bf8ce3cd2c6bb599a1814f1d275afabe21 Reviewed-on: https://go-review.googlesource.com/32313 Run-TryBot: Keith Randall <khr@golang.org> Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src/runtime/mfinal.go')
-rw-r--r--src/runtime/mfinal.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/mfinal.go b/src/runtime/mfinal.go
index e0da4a3ac0..7e191d4e7b 100644
--- a/src/runtime/mfinal.go
+++ b/src/runtime/mfinal.go
@@ -199,7 +199,7 @@ func runfinq() {
if len(ityp.mhdr) != 0 {
// convert to interface with methods
// this conversion is guaranteed to succeed - we checked in SetFinalizer
- assertE2I(ityp, *(*eface)(frame), (*iface)(frame))
+ *(*iface)(frame) = assertE2I(ityp, *(*eface)(frame))
}
default:
throw("bad kind in runfinq")
@@ -384,7 +384,7 @@ func SetFinalizer(obj interface{}, finalizer interface{}) {
// ok - satisfies empty interface
goto okarg
}
- if assertE2I2(ityp, *efaceOf(&obj), nil) {
+ if _, ok := assertE2I2(ityp, *efaceOf(&obj)); ok {
goto okarg
}
}