diff options
| -rw-r--r-- | src/cmd/compile/internal/ir/expr.go | 25 | ||||
| -rw-r--r-- | src/cmd/compile/internal/ir/name.go | 2 | ||||
| -rw-r--r-- | src/cmd/compile/internal/typecheck/expr.go | 8 |
3 files changed, 4 insertions, 31 deletions
diff --git a/src/cmd/compile/internal/ir/expr.go b/src/cmd/compile/internal/ir/expr.go index 986fb29e45..ffbeb20053 100644 --- a/src/cmd/compile/internal/ir/expr.go +++ b/src/cmd/compile/internal/ir/expr.go @@ -439,16 +439,6 @@ func NewParenExpr(pos src.XPos, x Node) *ParenExpr { func (n *ParenExpr) Implicit() bool { return n.flags&miniExprImplicit != 0 } func (n *ParenExpr) SetImplicit(b bool) { n.flags.set(miniExprImplicit, b) } -func (*ParenExpr) CanBeNtype() {} - -// SetOTYPE changes n to be an OTYPE node returning t, -// like all the type nodes in type.go. -func (n *ParenExpr) SetOTYPE(t *types.Type) { - n.op = OTYPE - n.typ = t - t.SetNod(n) -} - // A RawOrigExpr represents an arbitrary Go expression as a string value. // When printed in diagnostics, the string value is written out exactly as-is. type RawOrigExpr struct { @@ -558,10 +548,6 @@ func (n *SelectorExpr) FuncName() *Name { return fn } -// Before type-checking, bytes.Buffer is a SelectorExpr. -// After type-checking it becomes a Name. -func (*SelectorExpr) CanBeNtype() {} - // A SliceExpr is a slice expression X[Low:High] or X[Low:High:Max]. type SliceExpr struct { miniExpr @@ -633,17 +619,6 @@ func NewStarExpr(pos src.XPos, x Node) *StarExpr { func (n *StarExpr) Implicit() bool { return n.flags&miniExprImplicit != 0 } func (n *StarExpr) SetImplicit(b bool) { n.flags.set(miniExprImplicit, b) } -func (*StarExpr) CanBeNtype() {} - -// SetOTYPE changes n to be an OTYPE node returning t, -// like all the type nodes in type.go. -func (n *StarExpr) SetOTYPE(t *types.Type) { - n.op = OTYPE - n.X = nil - n.typ = t - t.SetNod(n) -} - // A TypeAssertionExpr is a selector expression X.(Type). // Before type-checking, the type is Ntype. type TypeAssertExpr struct { diff --git a/src/cmd/compile/internal/ir/name.go b/src/cmd/compile/internal/ir/name.go index 925994fe96..59269ff271 100644 --- a/src/cmd/compile/internal/ir/name.go +++ b/src/cmd/compile/internal/ir/name.go @@ -31,8 +31,6 @@ func NewIdent(pos src.XPos, sym *types.Sym) *Ident { func (n *Ident) Sym() *types.Sym { return n.sym } -func (*Ident) CanBeNtype() {} - // Name holds Node fields used only by named nodes (ONAME, OTYPE, some OLITERAL). type Name struct { miniExpr diff --git a/src/cmd/compile/internal/typecheck/expr.go b/src/cmd/compile/internal/typecheck/expr.go index ccad9bf3b8..b69fc2d60d 100644 --- a/src/cmd/compile/internal/typecheck/expr.go +++ b/src/cmd/compile/internal/typecheck/expr.go @@ -821,11 +821,11 @@ func tcStar(n *ir.StarExpr, top int) ir.Node { n.SetType(nil) return n } + + // TODO(mdempsky): Remove (along with ctxType above) once I'm + // confident this code path isn't needed any more. if l.Op() == ir.OTYPE { - n.SetOTYPE(types.NewPtr(l.Type())) - // Ensure l.Type gets CalcSize'd for the backend. Issue 20174. - types.CheckSize(l.Type()) - return n + base.Fatalf("unexpected type in deref expression: %v", l) } if !t.IsPtr() { |