From c69d54e7cd9d7bf52da680af0c4437645f373d16 Mon Sep 17 00:00:00 2001
From: Ken Thompson <ken@golang.org>
Date: Sat, 29 Mar 2008 16:27:12 -0700
Subject: [PATCH] bug28 fix code generation bug in second index of string
 slice.

SVN=114255
---
 src/c/gen.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/c/gen.c b/src/c/gen.c
index d3f473c10b6..57dbd84fd48 100644
--- a/src/c/gen.c
+++ b/src/c/gen.c
@@ -245,7 +245,7 @@ void
 cgen(Node *n)
 {
 	long lno;
-	Node *nl, *nr, *r, *r1;
+	Node *nl, *nr, *r;
 	int a;
 	Prog *p1, *p2, *p3;
 
@@ -358,21 +358,14 @@ cgen(Node *n)
 		break;
 
 	case OSLICE:
-		nl = n->left;
+		nl = n->left;	// name
 		nr = n->right;
 
-		r = nr->left;
-		if(usesptr(nr->left)) {
-			cgen(nr->left);
-			r = tempname(nr->left->type);
-			gopcodet(PSTORE, nr->left->type, r);
-		}
-
-		r1 = nr->right;
-		if(!nr->right->addable) {
-			cgen(nr->right);
-			r1 = tempname(nr->right->type);
-			gopcodet(PSTORE, nr->right->type, r1);
+		r = nr->right;	// index2
+		if(!r->addable) {
+			cgen(r);
+			r = tempname(r->type);
+			gopcodet(PSTORE, r->type, r);
 		}
 
 		// string into PTADDR
@@ -385,8 +378,8 @@ cgen(Node *n)
 		// offset in int reg
 		cgen(nr->left);
 
-		// len addressed
-		gopcodet(PSLICE, nr->left->type, nr->right);
+		// index 2 addressed
+		gopcodet(PSLICE, r->type, r);
 		break;
 
 	case OINDEXPTR: