From: Gabor Horvath <xazax.hun@gmail.com>
Date: Fri, 9 Aug 2019 19:01:23 +0000 (+0000)
Subject: Revert Even more warnings utilizing gsl::Owner/gsl::Pointer annotations
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14c49f8d7710c0006511d438f94628ea579672a7;p=clang

Revert Even more warnings utilizing gsl::Owner/gsl::Pointer annotations

This reverts r368454 (git commit 7c3c8ba8daf40534e09f6fe8701b723e25e4e2dc)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@368463 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index dfc12e91a6..44504971d8 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -6568,33 +6568,19 @@ static bool shouldTrackImplicitObjectArg(const CXXMethodDecl *Callee) {
   if (auto *Conv = dyn_cast_or_null<CXXConversionDecl>(Callee))
     if (isRecordWithAttr<PointerAttr>(Conv->getConversionType()))
       return true;
-  if (!Callee->getParent()->isInStdNamespace())
+  if (!Callee->getParent()->isInStdNamespace() || !Callee->getIdentifier())
     return false;
   if (!isRecordWithAttr<PointerAttr>(Callee->getThisObjectType()) &&
       !isRecordWithAttr<OwnerAttr>(Callee->getThisObjectType()))
     return false;
-  if (Callee->getReturnType()->isPointerType() ||
-      isRecordWithAttr<PointerAttr>(Callee->getReturnType())) {
-    if (!Callee->getIdentifier())
-      return false;
-    return llvm::StringSwitch<bool>(Callee->getName())
-        .Cases("begin", "rbegin", "cbegin", "crbegin", true)
-        .Cases("end", "rend", "cend", "crend", true)
-        .Cases("c_str", "data", "get", true)
-        // Map and set types.
-        .Cases("find", "equal_range", "lower_bound", "upper_bound", true)
-        .Default(false);
-  } else if (Callee->getReturnType()->isReferenceType()) {
-    if (!Callee->getIdentifier()) {
-      auto OO = Callee->getOverloadedOperator();
-      return OO == OverloadedOperatorKind::OO_Subscript ||
-             OO == OverloadedOperatorKind::OO_Star;
-    }
-    return llvm::StringSwitch<bool>(Callee->getName())
-        .Cases("front", "back", "at", true)
-        .Default(false);
-  }
-  return false;
+  if (!isRecordWithAttr<PointerAttr>(Callee->getReturnType()) &&
+      !Callee->getReturnType()->isPointerType())
+    return false;
+  return llvm::StringSwitch<bool>(Callee->getName())
+      .Cases("begin", "rbegin", "cbegin", "crbegin", true)
+      .Cases("end", "rend", "cend", "crend", true)
+      .Cases("c_str", "data", "get", true)
+      .Default(false);
 }
 
 static void handleGslAnnotatedTypes(IndirectLocalPath &Path, Expr *Call,
@@ -6614,12 +6600,6 @@ static void handleGslAnnotatedTypes(IndirectLocalPath &Path, Expr *Call,
     if (MD && shouldTrackImplicitObjectArg(MD))
       VisitPointerArg(MD, MCE->getImplicitObjectArgument());
     return;
-  } else if (auto *OCE = dyn_cast<CXXOperatorCallExpr>(Call)) {
-    FunctionDecl *Callee = OCE->getDirectCallee();
-    if (Callee->isCXXInstanceMember() &&
-        shouldTrackImplicitObjectArg(cast<CXXMethodDecl>(Callee)))
-      VisitPointerArg(Callee, OCE->getArg(0));
-    return;
   }
 
   if (auto *CCE = dyn_cast<CXXConstructExpr>(Call)) {
diff --git a/test/Sema/warn-lifetime-analysis-nocfg.cpp b/test/Sema/warn-lifetime-analysis-nocfg.cpp
index efa54fe662..89cf39a9ca 100644
--- a/test/Sema/warn-lifetime-analysis-nocfg.cpp
+++ b/test/Sema/warn-lifetime-analysis-nocfg.cpp
@@ -121,47 +121,24 @@ void initLocalGslPtrWithTempOwner() {
 
 namespace std {
 template <typename T>
-struct basic_iterator {
-  basic_iterator operator++();
-  T& operator*();
-};
-
-template<typename T>
-bool operator!=(basic_iterator<T>, basic_iterator<T>);
+struct basic_iterator {};
 
 template <typename T>
 struct vector {
   typedef basic_iterator<T> iterator;
   iterator begin();
-  iterator end();
   T *data();
-  T &at(int n);
-};
-
-template<typename T>
-struct basic_string_view {
-  basic_string_view(const T *);
-  const T *begin() const;
 };
 
 template<typename T>
 struct basic_string {
   const T *c_str() const;
-  operator basic_string_view<T> () const;
 };
 
-
 template<typename T>
 struct unique_ptr {
   T *get() const;
 };
-
-template<typename T>
-struct optional {
-  optional();
-  optional(const T&);
-  T &operator*();
-};
 }
 
 void modelIterators() {
@@ -191,29 +168,3 @@ int *danglingUniquePtrFromTemp() {
 int *danglingUniquePtrFromTemp2() {
   return std::unique_ptr<int>().get(); // expected-warning {{returning address of local temporary object}}
 }
-
-void danglingReferenceFromTempOwner() {
-  int &r = *std::optional<int>(); // expected-warning {{object backing the pointer will be destroyed at the end of the full-expression}}
-  int &r2 = *std::optional<int>(5); // expected-warning {{object backing the pointer will be destroyed at the end of the full-expression}}
-  int &r3 = std::vector<int>().at(3); // expected-warning {{object backing the pointer will be destroyed at the end of the full-expression}}
-}
-
-std::vector<int> getTempVec();
-std::optional<std::vector<int>> getTempOptVec();
-
-int &usedToBeFalsePositive(std::vector<int> &v) {
-  std::vector<int>::iterator it = v.begin();
-  int& value = *it;
-  return value; // ok
-}
-
-int &doNotFollowReferencesForLocalOwner() {
-  std::unique_ptr<int> localOwner;
-  int &p = *localOwner.get();
-  // In real world code localOwner is usually moved here.
-  return p; // ok
-}
-
-const char *trackThroughMultiplePointer() {
-  return std::basic_string_view<char>(std::basic_string<char>()).begin(); // expected-warning {{returning address of local temporary object}}
-}