forked from OSchip/llvm-project
Revert r135075, "format string checking: long and int have the same widths on 32-bit, so we shouldn't warn about using"
It fails on freebsd, mingw and msvc10. llvm-svn: 135129
This commit is contained in:
parent
5cf0e1534a
commit
91d831bc2d
|
@ -206,10 +206,6 @@ clang::analyze_format_string::ParseLengthModifier(FormatSpecifier &FS,
|
||||||
// Methods on ArgTypeResult.
|
// Methods on ArgTypeResult.
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
static bool hasSameSize(ASTContext &astContext, QualType typeA, QualType typeB) {
|
|
||||||
return astContext.getTypeSize(typeA) == astContext.getTypeSize(typeB);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ArgTypeResult::matchesType(ASTContext &C, QualType argTy) const {
|
bool ArgTypeResult::matchesType(ASTContext &C, QualType argTy) const {
|
||||||
switch (K) {
|
switch (K) {
|
||||||
case InvalidTy:
|
case InvalidTy:
|
||||||
|
@ -230,21 +226,26 @@ bool ArgTypeResult::matchesType(ASTContext &C, QualType argTy) const {
|
||||||
break;
|
break;
|
||||||
case BuiltinType::Char_S:
|
case BuiltinType::Char_S:
|
||||||
case BuiltinType::SChar:
|
case BuiltinType::SChar:
|
||||||
|
return T == C.UnsignedCharTy;
|
||||||
case BuiltinType::Char_U:
|
case BuiltinType::Char_U:
|
||||||
case BuiltinType::UChar:
|
case BuiltinType::UChar:
|
||||||
return hasSameSize(C, T, C.UnsignedCharTy);
|
return T == C.SignedCharTy;
|
||||||
case BuiltinType::Short:
|
case BuiltinType::Short:
|
||||||
|
return T == C.UnsignedShortTy;
|
||||||
case BuiltinType::UShort:
|
case BuiltinType::UShort:
|
||||||
return hasSameSize(C, T, C.ShortTy);
|
return T == C.ShortTy;
|
||||||
case BuiltinType::Int:
|
case BuiltinType::Int:
|
||||||
|
return T == C.UnsignedIntTy;
|
||||||
case BuiltinType::UInt:
|
case BuiltinType::UInt:
|
||||||
return hasSameSize(C, T, C.IntTy);
|
return T == C.IntTy;
|
||||||
case BuiltinType::Long:
|
case BuiltinType::Long:
|
||||||
|
return T == C.UnsignedLongTy;
|
||||||
case BuiltinType::ULong:
|
case BuiltinType::ULong:
|
||||||
return hasSameSize(C, T, C.LongTy);
|
return T == C.LongTy;
|
||||||
case BuiltinType::LongLong:
|
case BuiltinType::LongLong:
|
||||||
|
return T == C.UnsignedLongLongTy;
|
||||||
case BuiltinType::ULongLong:
|
case BuiltinType::ULongLong:
|
||||||
return hasSameSize(C, T, C.LongLongTy);
|
return T == C.LongLongTy;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
// RUN: %clang_cc1 -triple i386-apple-macosx10.7.0 -fsyntax-only -verify -Wformat-nonliteral %s
|
|
||||||
|
|
||||||
int printf(const char *restrict, ...);
|
|
||||||
|
|
||||||
// Test that 'long' is compatible with 'int' on 32-bit.
|
|
||||||
typedef unsigned int UInt32;
|
|
||||||
void test_rdar_9763999() {
|
|
||||||
UInt32 x = 7;
|
|
||||||
printf("x = %u\n", x); // no-warning
|
|
||||||
}
|
|
||||||
|
|
||||||
void test_positive() {
|
|
||||||
printf("%d", "hello"); // expected-warning {{conversion specifies type 'int' but the argument has type 'char *'}}
|
|
||||||
}
|
|
Loading…
Reference in New Issue