]> Cypherpunks.ru repositories - gostls13.git/commit
[dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge
authorKeith Randall <khr@golang.org>
Mon, 29 Feb 2016 21:31:48 +0000 (13:31 -0800)
committerKeith Randall <khr@golang.org>
Mon, 29 Feb 2016 21:32:20 +0000 (13:32 -0800)
commit4fffd4569d321feeceb1daf73595155e049bc1c4
tree60b1a5a80a498b9baa5258a50845c092e8d51ea4
parent4e95dfed0197ee6fdf96dc1aa632297a28a1cd95
parent71cc445cf92dd3014e8b382809ed1b9c077e7973
[dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge

(Last?) Semi-regular merge from tip to dev.ssa.

Conflicts:
src/cmd/compile/internal/gc/closure.go
src/cmd/compile/internal/gc/gsubr.go
src/cmd/compile/internal/gc/lex.go
src/cmd/compile/internal/gc/pgen.go
src/cmd/compile/internal/gc/syntax.go
src/cmd/compile/internal/gc/walk.go
src/cmd/internal/obj/pass.go

Change-Id: Ib5ea8bf74d420f4902a9c6208761be9f22371ae7
19 files changed:
src/cmd/compile/internal/gc/closure.go
src/cmd/compile/internal/gc/fmt.go
src/cmd/compile/internal/gc/gen.go
src/cmd/compile/internal/gc/go.go
src/cmd/compile/internal/gc/gsubr.go
src/cmd/compile/internal/gc/lex.go
src/cmd/compile/internal/gc/order.go
src/cmd/compile/internal/gc/pgen.go
src/cmd/compile/internal/gc/plive.go
src/cmd/compile/internal/gc/racewalk.go
src/cmd/compile/internal/gc/reflect.go
src/cmd/compile/internal/gc/sinit.go
src/cmd/compile/internal/gc/ssa.go
src/cmd/compile/internal/gc/syntax.go
src/cmd/compile/internal/gc/walk.go
src/cmd/internal/obj/link.go
src/cmd/internal/obj/pass.go
src/cmd/internal/obj/util.go
src/cmd/internal/obj/x86/obj6.go