cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-29 11:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cgo: fix enum const conflict

Browse Source 
This change prevents enum consts from conflicting with themselves
when loaded twice in different go files.

Fixes #1400.

R=rsc
CC=golang-dev
https://golang.org/cl/3849044
This commit is contained in:
Gustavo Niemeyer 2011-01-11 10:15:49 -05:00 committed by Russ Cox
parent 4bdaf59cc9
commit 02ff646fef
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/cgo/gcc.go
View File

@ -372,8 +372,12 @@ func (p *Package) loadDWARF(f *File, names []*Name) {
} else { } else {
n.Type = conv.Type(types[i]) n.Type = conv.Type(types[i])
if enums[i] != 0 && n.Type.EnumValues != nil { if enums[i] != 0 && n.Type.EnumValues != nil {
k := fmt.Sprintf("__cgo_enum__%d", i)
n.Kind = "const" n.Kind = "const"
n.Const = strconv.Itoa64(n.Type.EnumValues[fmt.Sprintf("__cgo_enum__%d", i)]) n.Const = strconv.Itoa64(n.Type.EnumValues[k])
// Remove injected enum to ensure the value will deep-compare
// equally in future loads of the same constant.
n.Type.EnumValues[k] = 0, false
} }
} }
} }