[dev.ssa] cmd/compile/internal/ssa: fix string slice types.

Change-Id: I28bc6373bb42d9abf4f179664dbaab8d514a6ab9
Reviewed-on: https://go-review.googlesource.com/14376
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 70990bbd183539104d9fe9a4502050be91e62191..a554a1dfd9a207ca704243a08d5d065ece5e43bb 100644 (file)
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -1722,12 +1722,12 @@ func (s *state) expr(n *Node) *ssa.Value {
                if n.Right.Left == nil {
                        low = zero
                } else {
-                       low = s.expr(n.Right.Left)
+                       low = s.extendIndex(s.expr(n.Right.Left))
                }
                if n.Right.Right == nil {
                        high = len
                } else {
-                       high = s.expr(n.Right.Right)
+                       high = s.extendIndex(s.expr(n.Right.Right))
                }
 
                // Panic if slice indices are not in bounds.

diff --git a/src/cmd/compile/internal/gc/testdata/string_ssa.go b/src/cmd/compile/internal/gc/testdata/string_ssa.go
index efc734e1a235f582cbef6bedf689210f9a2ed7a4..448433acd3e8e127fe71a1d2077925cf7baa85cd 100644 (file)
--- a/src/cmd/compile/internal/gc/testdata/string_ssa.go
+++ b/src/cmd/compile/internal/gc/testdata/string_ssa.go
@@ -86,9 +86,39 @@ func testStringSlicePanic() {
        failed = true
 }
 
+const _Accuracy_name = "BelowExactAbove"
+
+var _Accuracy_index = [...]uint8{0, 5, 10, 15}
+
+func testSmallIndexType_ssa(i int) string {
+       switch { // prevent inlining
+       }
+       return _Accuracy_name[_Accuracy_index[i]:_Accuracy_index[i+1]]
+}
+
+func testSmallIndexType() {
+       tests := []struct {
+               i    int
+               want string
+       }{
+               {0, "Below"},
+               {1, "Exact"},
+               {2, "Above"},
+       }
+
+       for i, t := range tests {
+               if got := testSmallIndexType_ssa(t.i); got != t.want {
+                       println("#", i, "got ", got, ", wanted", t.want)
+                       failed = true
+               }
+       }
+}
+
 func main() {
        testStringSlice()
        testStringSlicePanic()
+       testStructSlice()
+       testSmallIndexType()
 
        if failed {
                panic("failed")