From e97393dd73c4e2460f62ccdaa1069f50536bdc8f Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Thu, 26 Mar 2015 21:37:49 +0000 Subject: [PATCH] Fix -Wshift-count-negative. It didn't work if the right hand side of the shift wasn't a constant integer expression, now it (hopefully) does. PR: 22059 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233320 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 2 +- test/Sema/warn-shift-negative.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 test/Sema/warn-shift-negative.c diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index c061e0610e..6eac5b6a93 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -7769,7 +7769,7 @@ static void DiagnoseBadShiftValues(Sema& S, ExprResult &LHS, ExprResult &RHS, llvm::APSInt Right; // Check right/shifter operand if (RHS.get()->isValueDependent() || - !RHS.get()->isIntegerConstantExpr(Right, S.Context)) + !RHS.get()->EvaluateAsInt(Right, S.Context)) return; if (Right.isNegative()) { diff --git a/test/Sema/warn-shift-negative.c b/test/Sema/warn-shift-negative.c new file mode 100644 index 0000000000..c65d66c121 --- /dev/null +++ b/test/Sema/warn-shift-negative.c @@ -0,0 +1,6 @@ +// RUN: %clang_cc1 -fsyntax-only -Wshift-count-negative -fblocks -verify %s + +int f(int a) { + const int i = -1; + return a << i; // expected-warning{{shift count is negative}} +} -- 2.40.0