Revert r145697 and dependent patch r145702. It added a dependency from
lib/Analysis to lib/Sema which is cyclical.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145724 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/FormatString.cpp b/lib/Analysis/FormatString.cpp
index 0171bb7..6498ded 100644
--- a/lib/Analysis/FormatString.cpp
+++ b/lib/Analysis/FormatString.cpp
@@ -230,8 +230,7 @@
case SpecificTy: {
argTy = C.getCanonicalType(argTy).getUnqualifiedType();
- QualType U = C.getCanonicalType(T);
- if (U == argTy)
+ if (T == argTy)
return true;
// Check for "compatible types".
if (const BuiltinType *BT = argTy->getAs<BuiltinType>())
@@ -240,26 +239,26 @@
break;
case BuiltinType::Char_S:
case BuiltinType::SChar:
- return U == C.UnsignedCharTy;
+ return T == C.UnsignedCharTy;
case BuiltinType::Char_U:
case BuiltinType::UChar:
- return U == C.SignedCharTy;
+ return T == C.SignedCharTy;
case BuiltinType::Short:
- return U == C.UnsignedShortTy;
+ return T == C.UnsignedShortTy;
case BuiltinType::UShort:
- return U == C.ShortTy;
+ return T == C.ShortTy;
case BuiltinType::Int:
- return U == C.UnsignedIntTy;
+ return T == C.UnsignedIntTy;
case BuiltinType::UInt:
- return U == C.IntTy;
+ return T == C.IntTy;
case BuiltinType::Long:
- return U == C.UnsignedLongTy;
+ return T == C.UnsignedLongTy;
case BuiltinType::ULong:
- return U == C.LongTy;
+ return T == C.LongTy;
case BuiltinType::LongLong:
- return U == C.UnsignedLongLongTy;
+ return T == C.UnsignedLongLongTy;
case BuiltinType::ULongLong:
- return U == C.LongLongTy;
+ return T == C.LongLongTy;
}
return false;
}
@@ -486,3 +485,5 @@
}
return false;
}
+
+