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

go.tools/ssa: fix breakage caused by CL 9839045 to go/types.

Browse Source 
This removes the ast.CaseClase hack for implicit variables.

R=gri
CC=golang-dev
https://golang.org/cl/9863045
This commit is contained in:
Alan Donovan 2013-05-30 13:18:07 -04:00
parent faef64e271
commit 18f85da60d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssa/builder.go
View File

@ -1618,10 +1618,8 @@ func (b *Builder) typeSwitchStmt(fn *Function, s *ast.TypeSwitchStmt, label *lbl
if id != nil && len(cc.List) == 1 && casetype != tUntypedNil { if id != nil && len(cc.List) == 1 && casetype != tUntypedNil {
// Declare a new shadow local variable of the // Declare a new shadow local variable of the
// same name but a more specific type. // same name but a more specific type.
// Side effect: reassociates binding for y's object. y2 := fn.addNamedLocal(fn.Pkg.TypeInfo.typecases[cc])
y2 := fn.addNamedLocal(fn.Pkg.ObjectOf(id))
y2.name += "'" // debugging aid y2.name += "'" // debugging aid
y2.typ = pointer(casetype)
emitStore(fn, y2, ti) emitStore(fn, y2, ti)
} }
fn.targets = &targets{ fn.targets = &targets{
@ -1630,9 +1628,6 @@ func (b *Builder) typeSwitchStmt(fn *Function, s *ast.TypeSwitchStmt, label *lbl
} }
b.stmtList(fn, cc.Body) b.stmtList(fn, cc.Body)
fn.targets = fn.targets.tail fn.targets = fn.targets.tail
if id != nil {
fn.objects[fn.Pkg.ObjectOf(id)] = y // restore previous y binding
}
emitJump(fn, done) emitJump(fn, done)
fn.currentBlock = next fn.currentBlock = next
} }
@ -2476,6 +2471,7 @@ func (b *Builder) typecheck(importPath string, files []*ast.File) (*types.Packag
types: make(map[ast.Expr]types.Type), types: make(map[ast.Expr]types.Type),
idents: make(map[*ast.Ident]types.Object), idents: make(map[*ast.Ident]types.Object),
constants: make(map[ast.Expr]*Literal), constants: make(map[ast.Expr]*Literal),
typecases: make(map[*ast.CaseClause]*types.Var),
} }
tc := b.Context.TypeChecker tc := b.Context.TypeChecker
tc.Expr = func(x ast.Expr, typ types.Type, val exact.Value) { tc.Expr = func(x ast.Expr, typ types.Type, val exact.Value) {
@ -2490,6 +2486,11 @@ func (b *Builder) typecheck(importPath string, files []*ast.File) (*types.Packag
// - isBlankIdent(ident) <=> obj.GetType()==nil // - isBlankIdent(ident) <=> obj.GetType()==nil
info.idents[ident] = obj info.idents[ident] = obj
} }
tc.ImplicitObj = func(node ast.Node, obj types.Object) {
if cc, ok := node.(*ast.CaseClause); ok {
info.typecases[cc] = obj.(*types.Var)
}
}
typkg, firstErr := tc.Check(importPath, b.Prog.Files, files...) typkg, firstErr := tc.Check(importPath, b.Prog.Files, files...)
tc.Expr = nil tc.Expr = nil
tc.Ident = nil tc.Ident = nil

7
ssa/typeinfo.go
View File

@ -14,9 +14,10 @@ import (
// the abstract syntax for a single package. // the abstract syntax for a single package.
type TypeInfo struct { type TypeInfo struct {
fset *token.FileSet fset *token.FileSet
types map[ast.Expr]types.Type // inferred types of expressions types map[ast.Expr]types.Type // inferred types of expressions
constants map[ast.Expr]*Literal // values of constant expressions constants map[ast.Expr]*Literal // values of constant expressions
idents map[*ast.Ident]types.Object // canonical type objects for named entities idents map[*ast.Ident]types.Object // canonical type objects for named entities
typecases map[*ast.CaseClause]*types.Var // implicit vars for single-type typecases
} }
// TypeOf returns the type of expression e. // TypeOf returns the type of expression e.