aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Sema/SemaExpr.cpp3
-rw-r--r--test/Sema/shift.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index c6260344f1..b48703d8a1 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -1321,7 +1321,8 @@ inline QualType Sema::CheckShiftOperands( // C99 6.5.7
// Shifts don't perform usual arithmetic conversions, they just do integer
// promotions on each operand. C99 6.5.7p3
- UsualUnaryConversions(lex);
+ if (!isCompAssign)
+ UsualUnaryConversions(lex);
UsualUnaryConversions(rex);
// "The type of the result is that of the promoted left operand."
diff --git a/test/Sema/shift.c b/test/Sema/shift.c
new file mode 100644
index 0000000000..d5ae5c1e90
--- /dev/null
+++ b/test/Sema/shift.c
@@ -0,0 +1,6 @@
+// RUN: clang -fsyntax-only %s
+
+void test() {
+ char c;
+ c <<= 14;
+}