2017-03-02 06:30:26 -08:00
|
|
|
// run
|
|
|
|
|
|
|
|
|
|
// Copyright 2017 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.
|
|
|
|
|
|
|
|
|
|
package main
|
|
|
|
|
|
|
|
|
|
import "fmt"
|
|
|
|
|
|
|
|
|
|
func set(m map[interface{}]interface{}, key interface{}) (err error) {
|
|
|
|
|
defer func() {
|
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
|
err = fmt.Errorf("set failed: %v", r)
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
m[key] = nil
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func del(m map[interface{}]interface{}, key interface{}) (err error) {
|
|
|
|
|
defer func() {
|
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
|
err = fmt.Errorf("del failed: %v", r)
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
delete(m, key)
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
cmd/compile: avoid extra mapaccess in "m[k] op= r"
Currently, order desugars map assignment operations like
m[k] op= r
into
m[k] = m[k] op r
which in turn is transformed during walk into:
tmp := *mapaccess(m, k)
tmp = tmp op r
*mapassign(m, k) = tmp
However, this is suboptimal, as we could instead produce just:
*mapassign(m, k) op= r
One complication though is if "r == 0", then "m[k] /= r" and "m[k] %=
r" will panic, and they need to do so *before* calling mapassign,
otherwise we may insert a new zero-value element into the map.
It would be spec compliant to just emit the "r != 0" check before
calling mapassign (see #23735), but currently these checks aren't
generated until SSA construction. For now, it's simpler to continue
desugaring /= and %= into two map indexing operations.
Fixes #23661.
Change-Id: I46e3739d9adef10e92b46fdd78b88d5aabe68952
Reviewed-on: https://go-review.googlesource.com/91557
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
2018-02-01 21:33:56 -08:00
|
|
|
func addInt(m map[interface{}]int, key interface{}) (err error) {
|
|
|
|
|
defer func() {
|
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
|
err = fmt.Errorf("addInt failed: %v", r)
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
m[key] += 2018
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func addStr(m map[interface{}]string, key interface{}) (err error) {
|
|
|
|
|
defer func() {
|
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
|
err = fmt.Errorf("addStr failed: %v", r)
|
|
|
|
|
}
|
|
|
|
|
}()
|
|
|
|
|
m[key] += "hello, go"
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-02 06:30:26 -08:00
|
|
|
func main() {
|
|
|
|
|
m := make(map[interface{}]interface{})
|
|
|
|
|
set(m, []int{1, 2, 3})
|
|
|
|
|
set(m, "abc") // used to throw
|
|
|
|
|
del(m, []int{1, 2, 3})
|
|
|
|
|
del(m, "abc") // used to throw
|
cmd/compile: avoid extra mapaccess in "m[k] op= r"
Currently, order desugars map assignment operations like
m[k] op= r
into
m[k] = m[k] op r
which in turn is transformed during walk into:
tmp := *mapaccess(m, k)
tmp = tmp op r
*mapassign(m, k) = tmp
However, this is suboptimal, as we could instead produce just:
*mapassign(m, k) op= r
One complication though is if "r == 0", then "m[k] /= r" and "m[k] %=
r" will panic, and they need to do so *before* calling mapassign,
otherwise we may insert a new zero-value element into the map.
It would be spec compliant to just emit the "r != 0" check before
calling mapassign (see #23735), but currently these checks aren't
generated until SSA construction. For now, it's simpler to continue
desugaring /= and %= into two map indexing operations.
Fixes #23661.
Change-Id: I46e3739d9adef10e92b46fdd78b88d5aabe68952
Reviewed-on: https://go-review.googlesource.com/91557
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
2018-02-01 21:33:56 -08:00
|
|
|
|
|
|
|
|
mi := make(map[interface{}]int)
|
|
|
|
|
addInt(mi, []int{1, 2, 3})
|
|
|
|
|
addInt(mi, "abc") // used to throw
|
|
|
|
|
|
|
|
|
|
ms := make(map[interface{}]string)
|
|
|
|
|
addStr(ms, []int{1, 2, 3})
|
|
|
|
|
addStr(ms, "abc") // used to throw
|
2017-03-02 06:30:26 -08:00
|
|
|
}
|