summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorAkira Hatanaka <ahatanaka@apple.com>2017-09-20 06:27:39 +0000
committerAkira Hatanaka <ahatanaka@apple.com>2017-09-20 06:27:39 +0000
commit1b9418e163bb64c4f673bb2d53ab7ae4f73b1e66 (patch)
treead8e77909e75f0ae9bea119024b3729027fa4607 /clang/lib/Sema/SemaDeclCXX.cpp
parentfc587e6a570796ca321aa981866359c3ae13e21e (diff)
downloadbcm5719-llvm-1b9418e163bb64c4f673bb2d53ab7ae4f73b1e66.tar.gz
bcm5719-llvm-1b9418e163bb64c4f673bb2d53ab7ae4f73b1e66.zip
Revert "Add support for attribute 'noescape'."
This reverts r313717. I closed the wrong phabricator review. llvm-svn: 313721
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 312e0e24828..529084a517b 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -14081,21 +14081,8 @@ void Sema::DiagnoseReturnInConstructorExceptionHandler(CXXTryStmt *TryBlock) {
bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,
const CXXMethodDecl *Old) {
- const auto *NewFT = New->getType()->getAs<FunctionProtoType>();
- const auto *OldFT = Old->getType()->getAs<FunctionProtoType>();
-
- if (OldFT->hasExtParameterInfos()) {
- for (unsigned I = 0, E = OldFT->getNumParams(); I != E; ++I)
- // A parameter of the overriding method should be annotated with noescape
- // if the corresponding parameter of the overridden method is annotated.
- if (OldFT->getExtParameterInfo(I).isNoEscape() &&
- !NewFT->getExtParameterInfo(I).isNoEscape()) {
- Diag(New->getParamDecl(I)->getLocation(),
- diag::warn_overriding_method_missing_noescape);
- Diag(Old->getParamDecl(I)->getLocation(),
- diag::note_overridden_marked_noescape);
- }
- }
+ const FunctionType *NewFT = New->getType()->getAs<FunctionType>();
+ const FunctionType *OldFT = Old->getType()->getAs<FunctionType>();
CallingConv NewCC = NewFT->getCallConv(), OldCC = OldFT->getCallConv();
OpenPOWER on IntegriCloud