<div dir="ltr"><div class="gmail_extra">Selfhost failures are ultimately caused by:</div><div class="gmail_extra"><br></div><div class="gmail_extra"><a href="https://github.com/llvm-mirror/llvm/blob/master/utils/TableGen/X86RecognizableInstr.cpp#L709">https://github.com/llvm-mirror/llvm/blob/master/utils/TableGen/X86RecognizableInstr.cpp#L709</a><br></div><div class="gmail_extra"><a href="https://github.com/llvm-mirror/clang/blob/master/include/clang/AST/OperationKinds.h#L26">https://github.com/llvm-mirror/clang/blob/master/include/clang/AST/OperationKinds.h#L26</a><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">These are genuine bugs: assigning -1 into an enumeration with no negative enumerators results in undefined behavior. We should probably have a warning for the casts here rather than only detecting the problem under -Wtautological-compare, but I would not be surprised to find that Clang miscompiles itself with -fstrict-enums due to the above two issues.</div><div class="gmail_extra"><br><div class="gmail_quote">On 8 December 2017 at 13:40, Hans Wennborg via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">For what it's worth, Chromium's bitfield warning is easy to fix. The<br>
"-1 vs enum" comparisons are more plentiful and less straightforward.<br>
I'm guessing it's the same for the self-host.<br>
<div class="gmail-HOEnZb"><div class="gmail-h5"><br>
On Fri, Dec 8, 2017 at 1:33 PM, Richard Smith via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> I'm going to reland without the changes to bit-field handling. If we want<br>
> those changes (which I think we do, based on the bugs it found in selfhost),<br>
> that'll need to be done more carefully, and I don't want to get the<br>
> refactoring and bugfixes here tangled up with that.<br>
><br>
> On 8 December 2017 at 13:27, Bill Seurer via cfe-commits<br>
> <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
>><br>
>> It also caused all the sanitizer builds to fail. For example:<br>
>><br>
>> <a href="http://lab.llvm.org:8011/builders/sanitizer-ppc64le-linux/builds/3654" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/<wbr>builders/sanitizer-ppc64le-<wbr>linux/builds/3654</a><br>
>><br>
>><br>
>> /home/buildbots/ppc64le-<wbr>sanitizer/sanitizer-ppc64le/<wbr>build/llvm/utils/TableGen/<wbr>X86RecognizableInstr.cpp:789:<wbr>21:<br>
>> error: comparison of constant -1 with expression of type<br>
>> 'llvm::X86Disassembler::<wbr>OpcodeType' is always true<br>
>> [-Werror,-Wtautological-<wbr>constant-out-of-range-compare]<br>
>> assert(opcodeType != (OpcodeType)-1 &&<br>
>> ~~~~~~~~~~ ^ ~~~~~~~~~~~~~~<br>
>> /usr/include/assert.h:86:5: note: expanded from macro 'assert'<br>
>> ((expr) \<br>
>> ^~~~<br>
>> 1 error generated.<br>
>> utils/TableGen/CMakeFiles/obj.<wbr>llvm-tblgen.dir/build.make:<wbr>1022: recipe for<br>
>> target<br>
>> 'utils/TableGen/CMakeFiles/<wbr>obj.llvm-tblgen.dir/<wbr>X86RecognizableInstr.cpp.o'<br>
>> failed<br>
>> make[3]: ***<br>
>> [utils/TableGen/CMakeFiles/<wbr>obj.llvm-tblgen.dir/<wbr>X86RecognizableInstr.cpp.o]<br>
>> Error 1<br>
>><br>
>><br>
>><br>
>> And there are lots more warnings (which are flagged as errors for the<br>
>> sanitizer builds) when I run a build by hand. For example:<br>
>><br>
>> [4001/4008] Building CXX object<br>
>> tools/clang/tools/libclang/<wbr>CMakeFiles/libclang.dir/<wbr>CIndex.cpp.o<br>
>> In file included from<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/tools/libclang/<wbr>CIndex.cpp:23:<br>
>> In file included from<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/tools/libclang/<wbr>CursorVisitor.h:16:<br>
>> In file included from<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/include/clang/AST/<wbr>DeclVisitor.h:19:<br>
>> In file included from<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/include/clang/AST/<wbr>DeclCXX.h:21:<br>
>> In file included from<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/include/clang/AST/<wbr>Attr.h:19:<br>
>> /home/seurer/llvm/llvm-test2/<wbr>tools/clang/include/clang/AST/<wbr>Expr.h:2745:17:<br>
>> warning: comparison of constant -1 with expression of type 'const<br>
>> clang::CastKind' is always true<br>
>> [-Wtautological-constant-out-<wbr>of-range-compare]<br>
>> assert(kind != CK_Invalid && "creating cast with invalid cast kind");<br>
>> ~~~~ ^ ~~~~~~~~~~<br>
>> /usr/include/assert.h:89:5: note: expanded from macro 'assert'<br>
>> ((expr) \<br>
>> ^~~~<br>
>><br>
>><br>
>><br>
>> On 12/08/2017 10:54 AM, Hans Wennborg via cfe-commits wrote:<br>
>>><br>
>>> Author: hans<br>
>>> Date: Fri Dec 8 08:54:08 2017<br>
>>> New Revision: 320162<br>
>>><br>
>>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=320162&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=320162&view=rev</a><br>
>>> Log:<br>
>>> Revert "Unify implementation of our two different flavours of<br>
>>> -Wtautological-compare."<br>
>>><br>
>>>> Unify implementation of our two different flavours of<br>
>>>> -Wtautological-compare.<br>
>>>><br>
>>>> In so doing, fix a handful of remaining bugs where we would report false<br>
>>>> positives or false negatives if we promote a signed value to an unsigned<br>
>>>> type<br>
>>>> for the comparison.<br>
>>><br>
>>><br>
>>> This caused a new warning in Chromium:<br>
>>><br>
>>> ../../base/trace_event/trace_<wbr>log.cc:1545:29: error: comparison of<br>
>>> constant 64<br>
>>> with expression of type 'unsigned int' is always true<br>
>>> [-Werror,-Wtautological-<wbr>constant-out-of-range-compare]<br>
>>> DCHECK(handle.event_index < TraceBufferChunk::<wbr>kTraceBufferChunkSize);<br>
>>> ~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~<wbr>~~~~~~~~~<br>
>>><br>
>>> The 'unsigned int' is really a 6-bit bitfield, which is why it's always<br>
>>> less than 64.<br>
>>><br>
>>> I thought we didn't use to warn (with out-of-range-compare) when<br>
>>> comparing<br>
>>> against the boundaries of a type?<br>
>>><br>
>>> Modified:<br>
>>> cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp<br>
>>> cfe/trunk/test/Sema/<wbr>tautological-constant-compare.<wbr>c<br>
>>> cfe/trunk/test/Sema/<wbr>tautological-constant-enum-<wbr>compare.c<br>
>>> cfe/trunk/test/SemaCXX/<wbr>compare.cpp<br>
>>><br>
>>> Modified: cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=320162&r1=320161&r2=320162&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp?rev=320162&<wbr>r1=320161&r2=320162&view=diff</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp (original)<br>
>>> +++ cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp Fri Dec 8 08:54:08 2017<br>
>>> @@ -8662,113 +8662,54 @@ static bool isKnownToHaveUnsignedValue(E<br>
>>> }<br>
>>> namespace {<br>
>>> -/// The promoted range of values of a type. In general this has the<br>
>>> -/// following structure:<br>
>>> -///<br>
>>> -/// |-----------| . . . |-----------|<br>
>>> -/// ^ ^ ^ ^<br>
>>> -/// Min HoleMin HoleMax Max<br>
>>> -///<br>
>>> -/// ... where there is only a hole if a signed type is promoted to<br>
>>> unsigned<br>
>>> -/// (in which case Min and Max are the smallest and largest<br>
>>> representable<br>
>>> -/// values).<br>
>>> -struct PromotedRange {<br>
>>> - // Min, or HoleMax if there is a hole.<br>
>>> - llvm::APSInt PromotedMin;<br>
>>> - // Max, or HoleMin if there is a hole.<br>
>>> - llvm::APSInt PromotedMax;<br>
>>> -<br>
>>> - PromotedRange(IntRange R, unsigned BitWidth, bool Unsigned) {<br>
>>> - if (R.Width == 0)<br>
>>> - PromotedMin = PromotedMax = llvm::APSInt(BitWidth, Unsigned);<br>
>>> - else {<br>
>>> - PromotedMin = llvm::APSInt::getMinValue(R.<wbr>Width, R.NonNegative)<br>
>>> - .extOrTrunc(BitWidth);<br>
>>> - PromotedMin.setIsUnsigned(<wbr>Unsigned);<br>
>>> -<br>
>>> - PromotedMax = llvm::APSInt::getMaxValue(R.<wbr>Width, R.NonNegative)<br>
>>> - .extOrTrunc(BitWidth);<br>
>>> - PromotedMax.setIsUnsigned(<wbr>Unsigned);<br>
>>> - }<br>
>>> - }<br>
>>> - // Determine whether this range is contiguous (has no hole).<br>
>>> - bool isContiguous() const { return PromotedMin <= PromotedMax; }<br>
>>> +enum class LimitType {<br>
>>> + Max = 1U << 0U, // e.g. 32767 for short<br>
>>> + Min = 1U << 1U, // e.g. -32768 for short<br>
>>> + Both = Max | Min // When the value is both the Min and the Max limit<br>
>>> at the<br>
>>> + // same time; e.g. in C++, A::a in enum A { a = 0 };<br>
>>> +};<br>
>>> - // Where a constant value is within the range.<br>
>>> - enum ComparisonResult {<br>
>>> - LT = 0x1,<br>
>>> - LE = 0x2,<br>
>>> - GT = 0x4,<br>
>>> - GE = 0x8,<br>
>>> - EQ = 0x10,<br>
>>> - NE = 0x20,<br>
>>> - InRangeFlag = 0x40,<br>
>>> -<br>
>>> - Less = LE | LT | NE,<br>
>>> - Min = LE | InRangeFlag,<br>
>>> - InRange = InRangeFlag,<br>
>>> - Max = GE | InRangeFlag,<br>
>>> - Greater = GE | GT | NE,<br>
>>> +} // namespace<br>
>>> - OnlyValue = LE | GE | EQ | InRangeFlag,<br>
>>> - InHole = NE<br>
>>> - };<br>
>>> +/// Checks whether Expr 'Constant' may be the<br>
>>> +/// std::numeric_limits<>::max() or std::numeric_limits<>::min()<br>
>>> +/// of the Expr 'Other'. If true, then returns the limit type (min or<br>
>>> max).<br>
>>> +/// The Value is the evaluation of Constant<br>
>>> +static llvm::Optional<LimitType> IsTypeLimit(Sema &S, Expr *Constant,<br>
>>> + Expr *Other,<br>
>>> + const llvm::APSInt &Value)<br>
>>> {<br>
>>> + if (IsEnumConstOrFromMacro(S, Constant))<br>
>>> + return llvm::Optional<LimitType>();<br>
>>> - ComparisonResult compare(const llvm::APSInt &Value) const {<br>
>>> - assert(Value.getBitWidth() == PromotedMin.getBitWidth() &&<br>
>>> - Value.isUnsigned() == PromotedMin.isUnsigned());<br>
>>> - if (!isContiguous()) {<br>
>>> - assert(Value.isUnsigned() && "discontiguous range for signed<br>
>>> compare");<br>
>>> - if (Value.isMinValue()) return Min;<br>
>>> - if (Value.isMaxValue()) return Max;<br>
>>> - if (Value >= PromotedMin) return InRange;<br>
>>> - if (Value <= PromotedMax) return InRange;<br>
>>> - return InHole;<br>
>>> - }<br>
>>> + if (isKnownToHaveUnsignedValue(<wbr>Other) && Value == 0)<br>
>>> + return LimitType::Min;<br>
>>> - switch (llvm::APSInt::compareValues(<wbr>Value, PromotedMin)) {<br>
>>> - case -1: return Less;<br>
>>> - case 0: return PromotedMin == PromotedMax ? OnlyValue : Min;<br>
>>> - case 1:<br>
>>> - switch (llvm::APSInt::compareValues(<wbr>Value, PromotedMax)) {<br>
>>> - case -1: return InRange;<br>
>>> - case 0: return Max;<br>
>>> - case 1: return Greater;<br>
>>> - }<br>
>>> - }<br>
>>> + // TODO: Investigate using GetExprRange() to get tighter bounds<br>
>>> + // on the bit ranges.<br>
>>> + QualType OtherT = Other->IgnoreParenImpCasts()-><wbr>getType();<br>
>>> + if (const auto *AT = OtherT->getAs<AtomicType>())<br>
>>> + OtherT = AT->getValueType();<br>
>>> - llvm_unreachable("impossible compare result");<br>
>>> - }<br>
>>> + IntRange OtherRange = IntRange::forValueOfType(S.<wbr>Context, OtherT);<br>
>>> + if (Other-><wbr>isKnownToHaveBooleanValue())<br>
>>> + OtherRange = IntRange::forBoolType();<br>
>>> - static llvm::Optional<bool> constantValue(<wbr>BinaryOperatorKind Op,<br>
>>> - ComparisonResult R,<br>
>>> - bool ConstantOnRHS) {<br>
>>> - ComparisonResult TrueFlag, FalseFlag;<br>
>>> - if (Op == BO_EQ) {<br>
>>> - TrueFlag = EQ;<br>
>>> - FalseFlag = NE;<br>
>>> - } else if (Op == BO_NE) {<br>
>>> - TrueFlag = NE;<br>
>>> - FalseFlag = EQ;<br>
>>> - } else {<br>
>>> - if ((Op == BO_LT || Op == BO_GE) ^ ConstantOnRHS) {<br>
>>> - TrueFlag = LT;<br>
>>> - FalseFlag = GE;<br>
>>> - } else {<br>
>>> - TrueFlag = GT;<br>
>>> - FalseFlag = LE;<br>
>>> - }<br>
>>> - if (Op == BO_GE || Op == BO_LE)<br>
>>> - std::swap(TrueFlag, FalseFlag);<br>
>>> - }<br>
>>> - if (R & TrueFlag)<br>
>>> - return true;<br>
>>> - if (R & FalseFlag)<br>
>>> - return false;<br>
>>> - return llvm::None;<br>
>>> - }<br>
>>> -};<br>
>>> + // Special-case for C++ for enum with one enumerator with value of 0.<br>
>>> + if (OtherRange.Width == 0)<br>
>>> + return Value == 0 ? LimitType::Both : llvm::Optional<LimitType>();<br>
>>> +<br>
>>> + if (llvm::APSInt::isSameValue(<br>
>>> + llvm::APSInt::getMaxValue(<wbr>OtherRange.Width,<br>
>>> OtherRange.NonNegative),<br>
>>> + Value))<br>
>>> + return LimitType::Max;<br>
>>> +<br>
>>> + if (llvm::APSInt::isSameValue(<br>
>>> + llvm::APSInt::getMinValue(<wbr>OtherRange.Width,<br>
>>> OtherRange.NonNegative),<br>
>>> + Value))<br>
>>> + return LimitType::Min;<br>
>>> +<br>
>>> + return llvm::None;<br>
>>> }<br>
>>> static bool HasEnumType(Expr *E) {<br>
>>> @@ -8806,47 +8747,29 @@ static bool CheckTautologicalComparison(<br>
>>> if (S.inTemplateInstantiation() || !E->isRelationalOp())<br>
>>> return false;<br>
>>> - if (IsEnumConstOrFromMacro(S, Constant))<br>
>>> - return false;<br>
>>> -<br>
>>> - Expr *OriginalOther = Other;<br>
>>> + BinaryOperatorKind Op = E->getOpcode();<br>
>>> - Constant = Constant->IgnoreParenImpCasts(<wbr>);<br>
>>> - Other = Other->IgnoreParenImpCasts();<br>
>>> -<br>
>>> - // TODO: Investigate using GetExprRange() to get tighter bounds<br>
>>> - // on the bit ranges.<br>
>>> - QualType OtherT = Other->getType();<br>
>>> - if (const auto *AT = OtherT->getAs<AtomicType>())<br>
>>> - OtherT = AT->getValueType();<br>
>>> - IntRange OtherRange = IntRange::forValueOfType(S.<wbr>Context, OtherT);<br>
>>> -<br>
>>> - // Whether we're treating Other as being a bool because of the form of<br>
>>> - // expression despite it having another type (typically 'int' in C).<br>
>>> - bool OtherIsBooleanDespiteType =<br>
>>> - !OtherT->isBooleanType() && Other-><wbr>isKnownToHaveBooleanValue();<br>
>>> - if (OtherIsBooleanDespiteType)<br>
>>> - OtherRange = IntRange::forBoolType();<br>
>>> -<br>
>>> - if (FieldDecl *Bitfield = Other->getSourceBitField())<br>
>>> - if (!Bitfield->getBitWidth()-><wbr>isValueDependent())<br>
>>> - OtherRange.Width =<br>
>>> - std::min(Bitfield-><wbr>getBitWidthValue(S.Context),<br>
>>> OtherRange.Width);<br>
>>> -<br>
>>> - // Check whether the constant value can be represented in OtherRange.<br>
>>> Bail<br>
>>> - // out if so; this isn't an out-of-range comparison.<br>
>>> - PromotedRange OtherPromotedRange(OtherRange, Value.getBitWidth(),<br>
>>> - Value.isUnsigned());<br>
>>> -<br>
>>> - auto Cmp = OtherPromotedRange.compare(<wbr>Value);<br>
>>> - if (Cmp != PromotedRange::Min && Cmp != PromotedRange::Max &&<br>
>>> - Cmp != PromotedRange::OnlyValue)<br>
>>> + QualType OType = Other->IgnoreParenImpCasts()-><wbr>getType();<br>
>>> + if (!OType->isIntegerType())<br>
>>> return false;<br>
>>> - auto Result = PromotedRange::constantValue(<wbr>E->getOpcode(), Cmp,<br>
>>> RhsConstant);<br>
>>> - if (!Result)<br>
>>> + // Determine which limit (min/max) the constant is, if either.<br>
>>> + llvm::Optional<LimitType> ValueType = IsTypeLimit(S, Constant, Other,<br>
>>> Value);<br>
>>> + if (!ValueType)<br>
>>> return false;<br>
>>> + bool ConstIsLowerBound = (Op == BO_LT || Op == BO_LE) ^ RhsConstant;<br>
>>> + bool ResultWhenConstEqualsOther = (Op == BO_LE || Op == BO_GE);<br>
>>> + if (ValueType != LimitType::Both) {<br>
>>> + bool ResultWhenConstNeOther =<br>
>>> + ConstIsLowerBound ^ (ValueType == LimitType::Max);<br>
>>> + if (ResultWhenConstEqualsOther != ResultWhenConstNeOther)<br>
>>> + return false; // The comparison is not tautological.<br>
>>> + } else if (ResultWhenConstEqualsOther == ConstIsLowerBound)<br>
>>> + return false; // The comparison is not tautological.<br>
>>> +<br>
>>> + const bool Result = ResultWhenConstEqualsOther;<br>
>>> +<br>
>>> // Should be enough for uint128 (39 decimal digits)<br>
>>> SmallString<64> PrettySourceValue;<br>
>>> llvm::raw_svector_ostream OS(PrettySourceValue);<br>
>>> @@ -8859,20 +8782,20 @@ static bool CheckTautologicalComparison(<br>
>>> S.DiagRuntimeBehavior(<br>
>>> E->getOperatorLoc(), E,<br>
>>> S.PDiag(diag::warn_<wbr>tautological_bool_compare)<br>
>>> - << OS.str() << classifyConstantValue(<wbr>Constant)<br>
>>> - << OtherT << !OtherT->isBooleanType() << *Result<br>
>>> + << OS.str() <<<br>
>>> classifyConstantValue(<wbr>Constant->IgnoreParenImpCasts(<wbr>))<br>
>>> + << OType << !OType->isBooleanType() << Result<br>
>>> << E->getLHS()->getSourceRange() <<<br>
>>> E->getRHS()->getSourceRange())<wbr>;<br>
>>> return true;<br>
>>> }<br>
>>> - unsigned Diag = (isKnownToHaveUnsignedValue(<wbr>OriginalOther) && Value<br>
>>> == 0)<br>
>>> - ? (HasEnumType(OriginalOther)<br>
>>> + unsigned Diag = (isKnownToHaveUnsignedValue(<wbr>Other) && Value == 0)<br>
>>> + ? (HasEnumType(Other)<br>
>>> ?<br>
>>> diag::warn_unsigned_enum_<wbr>always_true_comparison<br>
>>> :<br>
>>> diag::warn_unsigned_always_<wbr>true_comparison)<br>
>>> : diag::warn_tautological_<wbr>constant_compare;<br>
>>> S.Diag(E->getOperatorLoc(), Diag)<br>
>>> - << RhsConstant << OtherT << E->getOpcodeStr() << OS.str() <<<br>
>>> *Result<br>
>>> + << RhsConstant << OType << E->getOpcodeStr() << OS.str() << Result<br>
>>> << E->getLHS()->getSourceRange() <<<br>
>>> E->getRHS()->getSourceRange();<br>
>>> return true;<br>
>>> @@ -8894,6 +8817,7 @@ static bool DiagnoseOutOfRangeComparison<br>
>>> QualType OtherT = Other->getType();<br>
>>> if (const auto *AT = OtherT->getAs<AtomicType>())<br>
>>> OtherT = AT->getValueType();<br>
>>> +<br>
>>> IntRange OtherRange = IntRange::forValueOfType(S.<wbr>Context, OtherT);<br>
>>> // Whether we're treating Other as being a bool because of the form<br>
>>> of<br>
>>> @@ -8903,25 +8827,91 @@ static bool DiagnoseOutOfRangeComparison<br>
>>> if (OtherIsBooleanDespiteType)<br>
>>> OtherRange = IntRange::forBoolType();<br>
>>> - if (FieldDecl *Bitfield = Other->getSourceBitField())<br>
>>> - if (!Bitfield->getBitWidth()-><wbr>isValueDependent())<br>
>>> - OtherRange.Width =<br>
>>> - std::min(Bitfield-><wbr>getBitWidthValue(S.Context),<br>
>>> OtherRange.Width);<br>
>>> + unsigned OtherWidth = OtherRange.Width;<br>
>>> +<br>
>>> + BinaryOperatorKind op = E->getOpcode();<br>
>>> + bool IsTrue = true;<br>
>>> // Check whether the constant value can be represented in<br>
>>> OtherRange. Bail<br>
>>> // out if so; this isn't an out-of-range comparison.<br>
>>> - PromotedRange OtherPromotedRange(OtherRange, Value.getBitWidth(),<br>
>>> - Value.isUnsigned());<br>
>>> - auto Cmp = OtherPromotedRange.compare(<wbr>Value);<br>
>>> -<br>
>>> - // If Value is in the range of possible Other values, this comparison<br>
>>> is not<br>
>>> - // tautological.<br>
>>> - if (Cmp & PromotedRange::InRangeFlag)<br>
>>> - return false;<br>
>>> + {<br>
>>> + QualType ConstantT = Constant->getType();<br>
>>> + QualType CommonT = E->getLHS()->getType();<br>
>>> - auto IsTrue = PromotedRange::constantValue(<wbr>E->getOpcode(), Cmp,<br>
>>> RhsConstant);<br>
>>> - if (!IsTrue)<br>
>>> - return false;<br>
>>> + if (S.Context.<wbr>hasSameUnqualifiedType(OtherT, ConstantT) &&<br>
>>> + !OtherIsBooleanDespiteType)<br>
>>> + return false;<br>
>>> + assert((OtherT->isIntegerType(<wbr>) && ConstantT->isIntegerType()) &&<br>
>>> + "comparison with non-integer type");<br>
>>> +<br>
>>> + bool ConstantSigned = ConstantT-><wbr>isSignedIntegerType();<br>
>>> + bool CommonSigned = CommonT->isSignedIntegerType()<wbr>;<br>
>>> +<br>
>>> + bool EqualityOnly = false;<br>
>>> +<br>
>>> + if (CommonSigned) {<br>
>>> + // The common type is signed, therefore no signed to unsigned<br>
>>> conversion.<br>
>>> + if (!OtherRange.NonNegative) {<br>
>>> + // Check that the constant is representable in type OtherT.<br>
>>> + if (ConstantSigned) {<br>
>>> + if (OtherWidth >= Value.getMinSignedBits())<br>
>>> + return false;<br>
>>> + } else { // !ConstantSigned<br>
>>> + if (OtherWidth >= Value.getActiveBits() + 1)<br>
>>> + return false;<br>
>>> + }<br>
>>> + } else { // !OtherSigned<br>
>>> + // Check that the constant is representable in type<br>
>>> OtherT.<br>
>>> + // Negative values are out of range.<br>
>>> + if (ConstantSigned) {<br>
>>> + if (Value.isNonNegative() && OtherWidth >=<br>
>>> Value.getActiveBits())<br>
>>> + return false;<br>
>>> + } else { // !ConstantSigned<br>
>>> + if (OtherWidth >= Value.getActiveBits())<br>
>>> + return false;<br>
>>> + }<br>
>>> + }<br>
>>> + } else { // !CommonSigned<br>
>>> + if (OtherRange.NonNegative) {<br>
>>> + if (OtherWidth >= Value.getActiveBits())<br>
>>> + return false;<br>
>>> + } else { // OtherSigned<br>
>>> + assert(!ConstantSigned &&<br>
>>> + "Two signed types converted to unsigned types.");<br>
>>> + // Check to see if the constant is representable in OtherT.<br>
>>> + if (OtherWidth > Value.getActiveBits())<br>
>>> + return false;<br>
>>> + // Check to see if the constant is equivalent to a negative<br>
>>> value<br>
>>> + // cast to CommonT.<br>
>>> + if (S.Context.getIntWidth(<wbr>ConstantT) ==<br>
>>> + S.Context.getIntWidth(CommonT) &&<br>
>>> + Value.isNegative() && Value.getMinSignedBits() <=<br>
>>> OtherWidth)<br>
>>> + return false;<br>
>>> + // The constant value rests between values that OtherT can<br>
>>> represent<br>
>>> + // after conversion. Relational comparison still works, but<br>
>>> equality<br>
>>> + // comparisons will be tautological.<br>
>>> + EqualityOnly = true;<br>
>>> + }<br>
>>> + }<br>
>>> +<br>
>>> + bool PositiveConstant = !ConstantSigned || Value.isNonNegative();<br>
>>> +<br>
>>> + if (op == BO_EQ || op == BO_NE) {<br>
>>> + IsTrue = op == BO_NE;<br>
>>> + } else if (EqualityOnly) {<br>
>>> + return false;<br>
>>> + } else if (RhsConstant) {<br>
>>> + if (op == BO_GT || op == BO_GE)<br>
>>> + IsTrue = !PositiveConstant;<br>
>>> + else // op == BO_LT || op == BO_LE<br>
>>> + IsTrue = PositiveConstant;<br>
>>> + } else {<br>
>>> + if (op == BO_LT || op == BO_LE)<br>
>>> + IsTrue = !PositiveConstant;<br>
>>> + else // op == BO_GT || op == BO_GE<br>
>>> + IsTrue = PositiveConstant;<br>
>>> + }<br>
>>> + }<br>
>>> // If this is a comparison to an enum constant, include that<br>
>>> // constant in the diagnostic.<br>
>>> @@ -8940,7 +8930,7 @@ static bool DiagnoseOutOfRangeComparison<br>
>>> E->getOperatorLoc(), E,<br>
>>> S.PDiag(diag::warn_out_of_<wbr>range_compare)<br>
>>> << OS.str() << classifyConstantValue(<wbr>Constant)<br>
>>> - << OtherT << OtherIsBooleanDespiteType << *IsTrue<br>
>>> + << OtherT << OtherIsBooleanDespiteType << IsTrue<br>
>>> << E->getLHS()->getSourceRange() <<<br>
>>> E->getRHS()->getSourceRange())<wbr>;<br>
>>> return true;<br>
>>><br>
>>> Modified: cfe/trunk/test/Sema/<wbr>tautological-constant-compare.<wbr>c<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/tautological-constant-compare.c?rev=320162&r1=320161&r2=320162&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Sema/<wbr>tautological-constant-compare.<wbr>c?rev=320162&r1=320161&r2=<wbr>320162&view=diff</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- cfe/trunk/test/Sema/<wbr>tautological-constant-compare.<wbr>c (original)<br>
>>> +++ cfe/trunk/test/Sema/<wbr>tautological-constant-compare.<wbr>c Fri Dec 8<br>
>>> 08:54:08 2017<br>
>>> @@ -94,17 +94,15 @@ int main()<br>
>>> if (-32768 >= s)<br>
>>> return 0;<br>
>>> - // Note: both sides are promoted to unsigned long prior to the<br>
>>> comparison, so<br>
>>> - // it is perfectly possible for a short to compare greater than<br>
>>> 32767UL.<br>
>>> if (s == 32767UL)<br>
>>> return 0;<br>
>>> if (s != 32767UL)<br>
>>> return 0;<br>
>>> if (s < 32767UL)<br>
>>> return 0;<br>
>>> - if (s <= 32767UL)<br>
>>> + if (s <= 32767UL) // expected-warning {{comparison 'short' <= 32767 is<br>
>>> always true}}<br>
>>> return 0;<br>
>>> - if (s > 32767UL)<br>
>>> + if (s > 32767UL) // expected-warning {{comparison 'short' > 32767 is<br>
>>> always false}}<br>
>>> return 0;<br>
>>> if (s >= 32767UL)<br>
>>> return 0;<br>
>>> @@ -113,66 +111,13 @@ int main()<br>
>>> return 0;<br>
>>> if (32767UL != s)<br>
>>> return 0;<br>
>>> - if (32767UL < s)<br>
>>> + if (32767UL < s) // expected-warning {{comparison 32767 < 'short' is<br>
>>> always false}}<br>
>>> return 0;<br>
>>> if (32767UL <= s)<br>
>>> return 0;<br>
>>> if (32767UL > s)<br>
>>> return 0;<br>
>>> - if (32767UL >= s)<br>
>>> - return 0;<br>
>>> -<br>
>>> - if (s == 0UL)<br>
>>> - return 0;<br>
>>> - if (s != 0UL)<br>
>>> - return 0;<br>
>>> - if (s < 0UL) // expected-warning {{comparison of unsigned expression <<br>
>>> 0 is always false}}<br>
>>> - return 0;<br>
>>> - if (s <= 0UL)<br>
>>> - return 0;<br>
>>> - if (s > 0UL)<br>
>>> - return 0;<br>
>>> - if (s >= 0UL) // expected-warning {{comparison of unsigned expression<br>
>>> >= 0 is always true}}<br>
>>> - return 0;<br>
>>> -<br>
>>> - if (0UL == s)<br>
>>> - return 0;<br>
>>> - if (0UL != s)<br>
>>> - return 0;<br>
>>> - if (0UL < s)<br>
>>> - return 0;<br>
>>> - if (0UL <= s) // expected-warning {{comparison of 0 <= unsigned<br>
>>> expression is always true}}<br>
>>> - return 0;<br>
>>> - if (0UL > s) // expected-warning {{comparison of 0 > unsigned<br>
>>> expression is always false}}<br>
>>> - return 0;<br>
>>> - if (0UL >= s)<br>
>>> - return 0;<br>
>>> -<br>
>>> - enum { ULONG_MAX = (2UL * (unsigned long)__LONG_MAX__ + 1UL) };<br>
>>> - if (s == 2UL * (unsigned long)__LONG_MAX__ + 1UL)<br>
>>> - return 0;<br>
>>> - if (s != 2UL * (unsigned long)__LONG_MAX__ + 1UL)<br>
>>> - return 0;<br>
>>> - if (s < 2UL * (unsigned long)__LONG_MAX__ + 1UL)<br>
>>> - return 0;<br>
>>> - if (s <= 2UL * (unsigned long)__LONG_MAX__ + 1UL) //<br>
>>> expected-warning-re {{comparison 'short' <= {{.*}} is always true}}<br>
>>> - return 0;<br>
>>> - if (s > 2UL * (unsigned long)__LONG_MAX__ + 1UL) //<br>
>>> expected-warning-re {{comparison 'short' > {{.*}} is always false}}<br>
>>> - return 0;<br>
>>> - if (s >= 2UL * (unsigned long)__LONG_MAX__ + 1UL)<br>
>>> - return 0;<br>
>>> -<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL == s)<br>
>>> - return 0;<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL != s)<br>
>>> - return 0;<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL < s) //<br>
>>> expected-warning-re {{comparison {{.*}} < 'short' is always false}}<br>
>>> - return 0;<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL <= s)<br>
>>> - return 0;<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL > s)<br>
>>> - return 0;<br>
>>> - if (2UL * (unsigned long)__LONG_MAX__ + 1UL >= s) //<br>
>>> expected-warning-re {{comparison {{.*}} >= 'short' is always true}}<br>
>>> + if (32767UL >= s) // expected-warning {{comparison 32767 >= 'short' is<br>
>>> always true}}<br>
>>> return 0;<br>
>>> // FIXME: assumes two's complement<br>
>>> @@ -336,6 +281,8 @@ int main()<br>
>>> if (0 >= s)<br>
>>> return 0;<br>
>>> + // However the comparison with 0U would warn<br>
>>> +<br>
>>> unsigned short us = value();<br>
>>> #ifdef TEST<br>
>>><br>
>>> Modified: cfe/trunk/test/Sema/<wbr>tautological-constant-enum-<wbr>compare.c<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/tautological-constant-enum-compare.c?rev=320162&r1=320161&r2=320162&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Sema/<wbr>tautological-constant-enum-<wbr>compare.c?rev=320162&r1=<wbr>320161&r2=320162&view=diff</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- cfe/trunk/test/Sema/<wbr>tautological-constant-enum-<wbr>compare.c (original)<br>
>>> +++ cfe/trunk/test/Sema/<wbr>tautological-constant-enum-<wbr>compare.c Fri Dec 8<br>
>>> 08:54:08 2017<br>
>>> @@ -9,96 +9,78 @@ int main() {<br>
>>> #ifdef SILENCE<br>
>>> // expected-no-diagnostics<br>
>>> -#else<br>
>>> - // If we promote to unsigned, it doesn't matter whether the enum's<br>
>>> underlying<br>
>>> - // type was signed.<br>
>>> - if (a < 0U) // expected-warning {{comparison of unsigned enum<br>
>>> expression < 0 is always false}}<br>
>>> - return 0;<br>
>>> - if (0U >= a)<br>
>>> - return 0;<br>
>>> - if (a > 0U)<br>
>>> - return 0;<br>
>>> - if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum<br>
>>> expression is always true}}<br>
>>> - return 0;<br>
>>> - if (a <= 0U)<br>
>>> - return 0;<br>
>>> - if (0U > a) // expected-warning {{comparison of 0 > unsigned enum<br>
>>> expression is always false}}<br>
>>> - return 0;<br>
>>> - if (a >= 0U) // expected-warning {{comparison of unsigned enum<br>
>>> expression >= 0 is always true}}<br>
>>> - return 0;<br>
>>> - if (0U < a)<br>
>>> - return 0;<br>
>>> +#endif<br>
>>> - if (a < 4294967295U)<br>
>>> +#ifdef UNSIGNED<br>
>>> +#ifndef SILENCE<br>
>>> + if (a < 0) // expected-warning {{comparison of unsigned enum<br>
>>> expression < 0 is always false}}<br>
>>> return 0;<br>
>>> - if (4294967295U >= a) // expected-warning {{comparison 4294967295 >=<br>
>>> 'enum A' is always true}}<br>
>>> + if (0 >= a)<br>
>>> return 0;<br>
>>> - if (a > 4294967295U) // expected-warning {{comparison 'enum A' ><br>
>>> 4294967295 is always false}}<br>
>>> + if (a > 0)<br>
>>> return 0;<br>
>>> - if (4294967295U <= a)<br>
>>> + if (0 <= a) // expected-warning {{comparison of 0 <= unsigned enum<br>
>>> expression is always true}}<br>
>>> return 0;<br>
>>> - if (a <= 4294967295U) // expected-warning {{comparison 'enum A' <=<br>
>>> 4294967295 is always true}}<br>
>>> + if (a <= 0)<br>
>>> return 0;<br>
>>> - if (4294967295U > a)<br>
>>> + if (0 > a) // expected-warning {{comparison of 0 > unsigned enum<br>
>>> expression is always false}}<br>
>>> return 0;<br>
>>> - if (a >= 4294967295U)<br>
>>> + if (a >= 0) // expected-warning {{comparison of unsigned enum<br>
>>> expression >= 0 is always true}}<br>
>>> return 0;<br>
>>> - if (4294967295U < a) // expected-warning {{comparison 4294967295 <<br>
>>> 'enum A' is always false}}<br>
>>> + if (0 < a)<br>
>>> return 0;<br>
>>> - if (a < 2147483647U)<br>
>>> + if (a < 0U) // expected-warning {{comparison of unsigned enum<br>
>>> expression < 0 is always false}}<br>
>>> return 0;<br>
>>> - if (2147483647U >= a)<br>
>>> + if (0U >= a)<br>
>>> return 0;<br>
>>> - if (a > 2147483647U)<br>
>>> + if (a > 0U)<br>
>>> return 0;<br>
>>> - if (2147483647U <= a)<br>
>>> + if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum<br>
>>> expression is always true}}<br>
>>> return 0;<br>
>>> - if (a <= 2147483647U)<br>
>>> + if (a <= 0U)<br>
>>> return 0;<br>
>>> - if (2147483647U > a)<br>
>>> + if (0U > a) // expected-warning {{comparison of 0 > unsigned enum<br>
>>> expression is always false}}<br>
>>> return 0;<br>
>>> - if (a >= 2147483647U)<br>
>>> + if (a >= 0U) // expected-warning {{comparison of unsigned enum<br>
>>> expression >= 0 is always true}}<br>
>>> return 0;<br>
>>> - if (2147483647U < a)<br>
>>> + if (0U < a)<br>
>>> return 0;<br>
>>> -#endif<br>
>>> -#if defined(UNSIGNED) && !defined(SILENCE)<br>
>>> - if (a < 0) // expected-warning {{comparison of unsigned enum<br>
>>> expression < 0 is always false}}<br>
>>> + if (a < 4294967295)<br>
>>> return 0;<br>
>>> - if (0 >= a)<br>
>>> + if (4294967295 >= a) // expected-warning {{comparison 4294967295 >=<br>
>>> 'enum A' is always true}}<br>
>>> return 0;<br>
>>> - if (a > 0)<br>
>>> + if (a > 4294967295) // expected-warning {{comparison 'enum A' ><br>
>>> 4294967295 is always false}}<br>
>>> return 0;<br>
>>> - if (0 <= a) // expected-warning {{comparison of 0 <= unsigned enum<br>
>>> expression is always true}}<br>
>>> + if (4294967295 <= a)<br>
>>> return 0;<br>
>>> - if (a <= 0)<br>
>>> + if (a <= 4294967295) // expected-warning {{comparison 'enum A' <=<br>
>>> 4294967295 is always true}}<br>
>>> return 0;<br>
>>> - if (0 > a) // expected-warning {{comparison of 0 > unsigned enum<br>
>>> expression is always false}}<br>
>>> + if (4294967295 > a)<br>
>>> return 0;<br>
>>> - if (a >= 0) // expected-warning {{comparison of unsigned enum<br>
>>> expression >= 0 is always true}}<br>
>>> + if (a >= 4294967295)<br>
>>> return 0;<br>
>>> - if (0 < a)<br>
>>> + if (4294967295 < a) // expected-warning {{comparison 4294967295 <<br>
>>> 'enum A' is always false}}<br>
>>> return 0;<br>
>>> - if (a < 4294967295)<br>
>>> + if (a < 4294967295U)<br>
>>> return 0;<br>
>>> - if (4294967295 >= a) // expected-warning {{comparison 4294967295 >=<br>
>>> 'enum A' is always true}}<br>
>>> + if (4294967295U >= a) // expected-warning {{comparison 4294967295 >=<br>
>>> 'enum A' is always true}}<br>
>>> return 0;<br>
>>> - if (a > 4294967295) // expected-warning {{comparison 'enum A' ><br>
>>> 4294967295 is always false}}<br>
>>> + if (a > 4294967295U) // expected-warning {{comparison 'enum A' ><br>
>>> 4294967295 is always false}}<br>
>>> return 0;<br>
>>> - if (4294967295 <= a)<br>
>>> + if (4294967295U <= a)<br>
>>> return 0;<br>
>>> - if (a <= 4294967295) // expected-warning {{comparison 'enum A' <=<br>
>>> 4294967295 is always true}}<br>
>>> + if (a <= 4294967295U) // expected-warning {{comparison 'enum A' <=<br>
>>> 4294967295 is always true}}<br>
>>> return 0;<br>
>>> - if (4294967295 > a)<br>
>>> + if (4294967295U > a)<br>
>>> return 0;<br>
>>> - if (a >= 4294967295)<br>
>>> + if (a >= 4294967295U)<br>
>>> return 0;<br>
>>> - if (4294967295 < a) // expected-warning {{comparison 4294967295 <<br>
>>> 'enum A' is always false}}<br>
>>> + if (4294967295U < a) // expected-warning {{comparison 4294967295 <<br>
>>> 'enum A' is always false}}<br>
>>> return 0;<br>
>>> -#else // SIGNED || SILENCE<br>
>>> +#else // SILENCE<br>
>>> if (a < 0)<br>
>>> return 0;<br>
>>> if (0 >= a)<br>
>>> @@ -116,24 +98,23 @@ int main() {<br>
>>> if (0 < a)<br>
>>> return 0;<br>
>>> -#ifndef SILENCE<br>
>>> - if (a < 4294967295) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always true}}<br>
>>> + if (a < 0U)<br>
>>> return 0;<br>
>>> - if (4294967295 >= a) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always true}}<br>
>>> + if (0U >= a)<br>
>>> return 0;<br>
>>> - if (a > 4294967295) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always false}}<br>
>>> + if (a > 0U)<br>
>>> return 0;<br>
>>> - if (4294967295 <= a) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always false}}<br>
>>> + if (0U <= a)<br>
>>> return 0;<br>
>>> - if (a <= 4294967295) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always true}}<br>
>>> + if (a <= 0U)<br>
>>> return 0;<br>
>>> - if (4294967295 > a) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always true}}<br>
>>> + if (0U > a)<br>
>>> return 0;<br>
>>> - if (a >= 4294967295) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always false}}<br>
>>> + if (a >= 0U)<br>
>>> return 0;<br>
>>> - if (4294967295 < a) // expected-warning {{comparison of constant<br>
>>> 4294967295 with expression of type 'enum A' is always false}}<br>
>>> + if (0U < a)<br>
>>> return 0;<br>
>>> -#else<br>
>>> +<br>
>>> if (a < 4294967295)<br>
>>> return 0;<br>
>>> if (4294967295 >= a)<br>
>>> @@ -150,10 +131,26 @@ int main() {<br>
>>> return 0;<br>
>>> if (4294967295 < a)<br>
>>> return 0;<br>
>>> -#endif<br>
>>> -#endif<br>
>>> -#if defined(SIGNED) && !defined(SILENCE)<br>
>>> + if (a < 4294967295U)<br>
>>> + return 0;<br>
>>> + if (4294967295U >= a)<br>
>>> + return 0;<br>
>>> + if (a > 4294967295U)<br>
>>> + return 0;<br>
>>> + if (4294967295U <= a)<br>
>>> + return 0;<br>
>>> + if (a <= 4294967295U)<br>
>>> + return 0;<br>
>>> + if (4294967295U > a)<br>
>>> + return 0;<br>
>>> + if (a >= 4294967295U)<br>
>>> + return 0;<br>
>>> + if (4294967295U < a)<br>
>>> + return 0;<br>
>>> +#endif<br>
>>> +#elif defined(SIGNED)<br>
>>> +#ifndef SILENCE<br>
>>> if (a < -2147483648) // expected-warning {{comparison 'enum A' <<br>
>>> -2147483648 is always false}}<br>
>>> return 0;<br>
>>> if (-2147483648 >= a)<br>
>>> @@ -187,25 +184,24 @@ int main() {<br>
>>> return 0;<br>
>>> if (2147483647 < a) // expected-warning {{comparison 2147483647 <<br>
>>> 'enum A' is always false}}<br>
>>> return 0;<br>
>>> -#elif defined(UNSIGNED) && !defined(SILENCE)<br>
>>> -#ifndef SILENCE<br>
>>> - if (a < -2147483648) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always false}}<br>
>>> +<br>
>>> + if (a < 2147483647U)<br>
>>> return 0;<br>
>>> - if (-2147483648 >= a) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always false}}<br>
>>> + if (2147483647U >= a) // expected-warning {{comparison 2147483647 >=<br>
>>> 'enum A' is always true}}<br>
>>> return 0;<br>
>>> - if (a > -2147483648) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always true}}<br>
>>> + if (a > 2147483647U) // expected-warning {{comparison 'enum A' ><br>
>>> 2147483647 is always false}}<br>
>>> return 0;<br>
>>> - if (-2147483648 <= a) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always true}}<br>
>>> + if (2147483647U <= a)<br>
>>> return 0;<br>
>>> - if (a <= -2147483648) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always false}}<br>
>>> + if (a <= 2147483647U) // expected-warning {{comparison 'enum A' <=<br>
>>> 2147483647 is always true}}<br>
>>> return 0;<br>
>>> - if (-2147483648 > a) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always false}}<br>
>>> + if (2147483647U > a)<br>
>>> return 0;<br>
>>> - if (a >= -2147483648) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always true}}<br>
>>> + if (a >= 2147483647U)<br>
>>> return 0;<br>
>>> - if (-2147483648 < a) // expected-warning {{comparison of constant<br>
>>> -2147483648 with expression of type 'enum A' is always true}}<br>
>>> + if (2147483647U < a) // expected-warning {{comparison 2147483647 <<br>
>>> 'enum A' is always false}}<br>
>>> return 0;<br>
>>> -#else<br>
>>> +#else // SILENCE<br>
>>> if (a < -2147483648)<br>
>>> return 0;<br>
>>> if (-2147483648 >= a)<br>
>>> @@ -222,7 +218,6 @@ int main() {<br>
>>> return 0;<br>
>>> if (-2147483648 < a)<br>
>>> return 0;<br>
>>> -#endif<br>
>>> if (a < 2147483647)<br>
>>> return 0;<br>
>>> @@ -240,6 +235,24 @@ int main() {<br>
>>> return 0;<br>
>>> if (2147483647 < a)<br>
>>> return 0;<br>
>>> +<br>
>>> + if (a < 2147483647U)<br>
>>> + return 0;<br>
>>> + if (2147483647U >= a)<br>
>>> + return 0;<br>
>>> + if (a > 2147483647U)<br>
>>> + return 0;<br>
>>> + if (2147483647U <= a)<br>
>>> + return 0;<br>
>>> + if (a <= 2147483647U)<br>
>>> + return 0;<br>
>>> + if (2147483647U > a)<br>
>>> + return 0;<br>
>>> + if (a >= 2147483647U)<br>
>>> + return 0;<br>
>>> + if (2147483647U < a)<br>
>>> + return 0;<br>
>>> +#endif<br>
>>> #endif<br>
>>> return 1;<br>
>>><br>
>>> Modified: cfe/trunk/test/SemaCXX/<wbr>compare.cpp<br>
>>> URL:<br>
>>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/compare.cpp?rev=320162&r1=320161&r2=320162&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/compare.cpp?rev=<wbr>320162&r1=320161&r2=320162&<wbr>view=diff</a><br>
>>><br>
>>> ==============================<wbr>==============================<wbr>==================<br>
>>> --- cfe/trunk/test/SemaCXX/<wbr>compare.cpp (original)<br>
>>> +++ cfe/trunk/test/SemaCXX/<wbr>compare.cpp Fri Dec 8 08:54:08 2017<br>
>>> @@ -245,8 +245,8 @@ void test4(short s) {<br>
>>> // unsigned.<br>
>>> const unsigned B = -1;<br>
>>> void (s < B); // expected-warning{{comparison of integers of<br>
>>> different signs: 'short' and 'const unsigned int'}}<br>
>>> - void (s > B); // expected-warning{{comparison 'short' > 4294967295 is<br>
>>> always false}}<br>
>>> - void (s <= B); // expected-warning{{comparison 'short' <= 4294967295<br>
>>> is always true}}<br>
>>> + void (s > B); // expected-warning{{comparison of integers of different<br>
>>> signs: 'short' and 'const unsigned int'}}<br>
>>> + void (s <= B); // expected-warning{{comparison of integers of<br>
>>> different signs: 'short' and 'const unsigned int'}}<br>
>>> void (s >= B); // expected-warning{{comparison of integers of<br>
>>> different signs: 'short' and 'const unsigned int'}}<br>
>>> void (s == B); // expected-warning{{comparison of integers of<br>
>>> different signs: 'short' and 'const unsigned int'}}<br>
>>> void (s != B); // expected-warning{{comparison of integers of<br>
>>> different signs: 'short' and 'const unsigned int'}}<br>
>>><br>
>>><br>
>>> ______________________________<wbr>_________________<br>
>>> cfe-commits mailing list<br>
>>> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
>>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
>>><br>
>><br>
>><br>
>> --<br>
>><br>
>> -Bill Seurer<br>
>><br>
>><br>
>> ______________________________<wbr>_________________<br>
>> cfe-commits mailing list<br>
>> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
><br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
><br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>