Skip to content

Commit

Permalink
cmd/compile: prevent Noalg from breaking user types
Browse files Browse the repository at this point in the history
Use a separate symbol for reflect metadata for types with Noalg set.

Fixes #17752.

Change-Id: Icb6cade7e3004fc4108f67df61105dc4085cd7e2
Reviewed-on: https://go-review.googlesource.com/32679
Reviewed-by: David Crawshaw <[email protected]>
Run-TryBot: Matthew Dempsky <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
  • Loading branch information
mdempsky committed Nov 4, 2016
1 parent fa77001 commit 3797446
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
9 changes: 8 additions & 1 deletion src/cmd/compile/internal/gc/reflect.go
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,14 @@ func dcommontype(s *Sym, ot int, t *Type) int {
}

func typesym(t *Type) *Sym {
return Pkglookup(t.tconv(FmtLeft), typepkg)
name := t.tconv(FmtLeft)

// Use a separate symbol name for Noalg types for #17752.
if a, bad := algtype1(t); a == ANOEQ && bad.Noalg {
name = "noalg." + name
}

return Pkglookup(name, typepkg)
}

// tracksym returns the symbol for tracking use of field/method f, assumed
Expand Down
1 change: 0 additions & 1 deletion src/cmd/compile/internal/gc/walk.go
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,6 @@ func mkdotargslice(lr0, nn []*Node, l *Field, fp int, init *Nodes, ddd *Node) []
}

tslice := typSlice(l.Type.Elem())
tslice.Noalg = true

var n *Node
if len(lr0) == 0 {
Expand Down
20 changes: 20 additions & 0 deletions test/fixedbugs/issue17752.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// run

// Copyright 2016 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

func f(m map[string]int) int {
return m["a"]
}

func g(m map[[8]string]int) int {
return m[[8]string{"a", "a", "a", "a", "a", "a", "a", "a"}]
}

func main() {
m := map[[8]string]int{}
g(m)
}

0 comments on commit 3797446

Please sign in to comment.