jc: fix opcode for vlong shifts

1 files changed, 15 insertions, 5 deletions

diff --git a/utils/ic/cgen.c b/utils/ic/cgen.c
index a8bf5ea1..7afe3290 100644
--- a/utils/ic/cgen.c
+++ b/utils/ic/cgen.c
@@ -179,11 +179,21 @@ cgen(Node *n, Node *nn)
 			cgen(r, &nod1);
 			gopcode(o, &nod1, Z, &nod);
 		} else {
-			regalloc(&nod, r, nn);
-			cgen(r, &nod);
-			regalloc(&nod1, l, Z);
-			cgen(l, &nod1);
-			gopcode(o, &nod, &nod1, &nod);
+			if(typev[n->type->etype] &&
+			   (o == OLSHR || o == OASHL || o == OASHR)){
+				/* vlong shifts: result has type of l, not type of r */
+				regalloc(&nod1, r, Z);
+				cgen(r, &nod1);
+				regalloc(&nod, l, nn);
+				cgen(l, &nod);
+				gopcode(o, &nod1, Z, &nod);
+			}else{
+				regalloc(&nod, r, nn);
+				cgen(r, &nod);
+				regalloc(&nod1, l, Z);
+				cgen(l, &nod1);
+				gopcode(o, &nod, &nod1, &nod);
+			}
 		}
 		gopcode(OAS, &nod, Z, nn);
 		regfree(&nod);