diff options
author | Nick Lewycky <nicholas@mxc.ca> | 2011-12-02 23:21:43 +0000 |
---|---|---|
committer | Nick Lewycky <nicholas@mxc.ca> | 2011-12-02 23:21:43 +0000 |
commit | 687b5df89d4ba91219df578d02087c68c09a0332 (patch) | |
tree | 72ce07514f390ecac3b02890218d448185cd455e /lib/Analysis/PrintfFormatString.cpp | |
parent | 3aaeccc597fa49e5b5aa9c197ef699d2c19ec86b (diff) |
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
Diffstat (limited to 'lib/Analysis/PrintfFormatString.cpp')
-rw-r--r-- | lib/Analysis/PrintfFormatString.cpp | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp index e3d76507cd..70dbfd30ce 100644 --- a/lib/Analysis/PrintfFormatString.cpp +++ b/lib/Analysis/PrintfFormatString.cpp @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "clang/Analysis/Analyses/FormatString.h" -#include "clang/Sema/Sema.h" #include "FormatStringParsing.h" using clang::analyze_format_string::ArgTypeResult; @@ -279,27 +278,8 @@ const char *ConversionSpecifier::toString() const { // Methods on PrintfSpecifier. //===----------------------------------------------------------------------===// -/// \brief Try to find and return a typedef type named Name whose actual type -/// is Underlying. Return Underlying if such a typedef cannot be found. -static QualType FindTypedef(Sema &S, const char *Name, QualType Underlying) { - ASTContext &Ctx = S.getASTContext(); - IdentifierInfo &II = Ctx.Idents.get(Name); - - NamedDecl *D = S.LookupSingleName(S.getCurScope(), DeclarationName(&II), - SourceLocation(), Sema::LookupOrdinaryName); - - if (TypedefDecl *TD = dyn_cast_or_null<TypedefDecl>(D)) { - QualType TypedefType = Ctx.getTypedefType(TD, QualType()); - if (Ctx.getCanonicalType(TypedefType) == Underlying) - return TypedefType; - } - - return Underlying; -} - -ArgTypeResult PrintfSpecifier::getArgType(Sema &S) const { +ArgTypeResult PrintfSpecifier::getArgType(ASTContext &Ctx) const { const PrintfConversionSpecifier &CS = getConversionSpecifier(); - ASTContext &Ctx = S.getASTContext(); if (!CS.consumesDataArgument()) return ArgTypeResult::Invalid(); @@ -321,13 +301,11 @@ ArgTypeResult PrintfSpecifier::getArgType(Sema &S) const { case LengthModifier::AsShort: return Ctx.ShortTy; case LengthModifier::AsLong: return Ctx.LongTy; case LengthModifier::AsLongLong: return Ctx.LongLongTy; - case LengthModifier::AsIntMax: - return FindTypedef(S, "intmax_t", Ctx.getIntMaxType()); + case LengthModifier::AsIntMax: return Ctx.getIntMaxType(); case LengthModifier::AsSizeT: // FIXME: How to get the corresponding signed version of size_t? return ArgTypeResult(); - case LengthModifier::AsPtrDiff: - return FindTypedef(S, "ptrdiff_t", Ctx.getPointerDiffType()); + case LengthModifier::AsPtrDiff: return Ctx.getPointerDiffType(); } if (CS.isUIntArg()) @@ -339,10 +317,9 @@ ArgTypeResult PrintfSpecifier::getArgType(Sema &S) const { case LengthModifier::AsShort: return Ctx.UnsignedShortTy; case LengthModifier::AsLong: return Ctx.UnsignedLongTy; case LengthModifier::AsLongLong: return Ctx.UnsignedLongLongTy; - case LengthModifier::AsIntMax: - return FindTypedef(S, "uintmax_t", Ctx.getUIntMaxType()); + case LengthModifier::AsIntMax: return Ctx.getUIntMaxType(); case LengthModifier::AsSizeT: - return FindTypedef(S, "size_t", Ctx.getSizeType()); + return Ctx.getSizeType(); case LengthModifier::AsPtrDiff: // FIXME: How to get the corresponding unsigned // version of ptrdiff_t? |