diff options
| author | Manman Ren <manman.ren@gmail.com> | 2016-03-17 22:13:50 +0000 |
|---|---|---|
| committer | Manman Ren <manman.ren@gmail.com> | 2016-03-17 22:13:50 +0000 |
| commit | 34888f86ef0a27e070138050278a92573f015b2f (patch) | |
| tree | d8bc7a5136e4cc876732c43c1f3b71c73cb7b279 /clang/lib/Sema/SemaDeclAttr.cpp | |
| parent | 5c966a20639fd914cfa0c7acb9765050a1997648 (diff) | |
| download | bcm5719-llvm-34888f86ef0a27e070138050278a92573f015b2f.tar.gz bcm5719-llvm-34888f86ef0a27e070138050278a92573f015b2f.zip | |
Revert r263687 for ubsan bot failure.
llvm-svn: 263752
Diffstat (limited to 'clang/lib/Sema/SemaDeclAttr.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index c90d6236c18..18065cb52d8 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -1941,7 +1941,6 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, bool IsUnavailable, StringRef Message, bool IsStrict, - StringRef Replacement, AvailabilityMergeKind AMK, unsigned AttrSpellingListIndex) { VersionTuple MergedIntroduced = Introduced; @@ -2088,8 +2087,7 @@ AvailabilityAttr *Sema::mergeAvailabilityAttr(NamedDecl *D, SourceRange Range, return ::new (Context) AvailabilityAttr(Range, Context, Platform, Introduced, Deprecated, Obsoleted, IsUnavailable, Message, - IsStrict, Replacement, - AttrSpellingListIndex); + IsStrict, AttrSpellingListIndex); } return nullptr; } @@ -2121,17 +2119,13 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, if (const StringLiteral *SE = dyn_cast_or_null<StringLiteral>(Attr.getMessageExpr())) Str = SE->getString(); - StringRef Replacement; - if (const StringLiteral *SE = - dyn_cast_or_null<StringLiteral>(Attr.getReplacementExpr())) - Replacement = SE->getString(); AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(ND, Attr.getRange(), II, Introduced.Version, Deprecated.Version, Obsoleted.Version, IsUnavailable, Str, - IsStrict, Replacement, + IsStrict, Sema::AMK_None, Index); if (NewAttr) @@ -2177,7 +2171,6 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, NewObsoleted, IsUnavailable, Str, IsStrict, - Replacement, Sema::AMK_None, Index); if (NewAttr) @@ -2201,7 +2194,6 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, Obsoleted.Version, IsUnavailable, Str, IsStrict, - Replacement, Sema::AMK_None, Index); if (NewAttr) @@ -6237,8 +6229,6 @@ static void DoEmitAvailabilityWarning(Sema &S, Sema::AvailabilityDiagnostic K, if (K == Sema::AD_Deprecation) { if (auto attr = D->getAttr<DeprecatedAttr>()) Replacement = attr->getReplacement(); - if (auto attr = D->getAttr<AvailabilityAttr>()) - Replacement = attr->getReplacement(); if (!Replacement.empty()) UseRange = |
