[dev.typeparams] all: merge master (37f9a8f) into dev.typeparams

[gostls13.git] / src / cmd / compile / internal / ssagen / ssa.go

diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go
index 9212c5776e14ecfcf48f985fc2404c759ded31c4..2bf34b0a84d45f6ddac395966a6a459bce2bfab6 100644 (file)
--- a/src/cmd/compile/internal/ssagen/ssa.go
+++ b/src/cmd/compile/internal/ssagen/ssa.go
@@ -3106,7 +3106,7 @@ func (s *state) expr(n ir.Node) *ssa.Value {
                arrlen := s.constInt(types.Types[types.TINT], n.Type().Elem().NumElem())
                cap := s.newValue1(ssa.OpSliceLen, types.Types[types.TINT], v)
                s.boundsCheck(arrlen, cap, ssa.BoundsConvert, false)
-               return s.newValue1(ssa.OpSlicePtrUnchecked, types.Types[types.TINT], v)
+               return s.newValue1(ssa.OpSlicePtrUnchecked, n.Type(), v)
 
        case ir.OCALLFUNC:
                n := n.(*ir.CallExpr)