From d27a0b35482b907357d76a9db4e0b18ec89cf979 Mon Sep 17 00:00:00 2001
From: Vincent Lefevre <vincent@vinc17.net>
Date: Fri, 6 Jul 2012 14:22:37 +0200
Subject: [PATCH] Incorrect shift result type on unsigned short first argument.

The code for shifts is now similar to code for binary arithmetic operations,
except that only the first argument is considered, as required by the ISO C
standard.
---
 tccgen.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tccgen.c b/tccgen.c
index 26a57816..d27bdbaa 100644
--- a/tccgen.c
+++ b/tccgen.c
@@ -1679,7 +1679,9 @@ ST_FUNC void gen_op(int op)
             tcc_error("invalid operands for binary operation");
         goto std_op;
     } else if (op == TOK_SHR || op == TOK_SAR || op == TOK_SHL) {
-        t = (bt1 == VT_LLONG ? VT_LLONG : VT_INT) | (t1 & VT_UNSIGNED);
+        t = bt1 == VT_LLONG ? VT_LLONG : VT_INT;
+        if ((t1 & (VT_BTYPE | VT_UNSIGNED)) == (t | VT_UNSIGNED))
+          t |= VT_UNSIGNED;
         goto std_op;
     } else if (bt1 == VT_LLONG || bt2 == VT_LLONG) {
         /* cast to biggest op */