Address review comments.

Author: hokein

clang/lib/Sema/CheckExprLifetime.cpp

@@ -290,15 +290,15 @@ static bool isContainerOfPointer(const RecordDecl *Container) {
   return false;
 }
 static bool isContainerOfOwner(const RecordDecl *Container) {
-  if (const auto *CTSD =
-          dyn_cast_if_present<ClassTemplateSpecializationDecl>(Container)) {
-    if (!CTSD->hasAttr<OwnerAttr>()) // Container must be a GSL owner type.
-      return false;
-    const auto &TAs = CTSD->getTemplateArgs();
-    return TAs.size() > 0 && TAs[0].getKind() == TemplateArgument::Type &&
-           isRecordWithAttr<OwnerAttr>(TAs[0].getAsType());
-  }
-  return false;
+  const auto *CTSD =
+      dyn_cast_if_present<ClassTemplateSpecializationDecl>(Container);
+  if (!CTSD)
+    return false;
+  if (!CTSD->hasAttr<OwnerAttr>()) // Container must be a GSL owner type.
+    return false;
+  const auto &TAs = CTSD->getTemplateArgs();
+  return TAs.size() > 0 && TAs[0].getKind() == TemplateArgument::Type &&
+         isRecordWithAttr<OwnerAttr>(TAs[0].getAsType());
 }
 
 // Returns true if the given Record is `std::initializer_list<pointer>`.
@@ -383,7 +383,7 @@ static bool isCopyLikeConstructor(const CXXConstructorDecl *Ctor) {
   if (!ParamRefType)
     return false;
 
-  // Check if the first parameter type "Owner<U>".
+  // Check if the first parameter type is "Owner<U>".
   if (const auto *TST =
           ParamRefType->getPointeeType()->getAs<TemplateSpecializationType>())
     return TST->getTemplateName()

clang/test/Sema/warn-lifetime-analysis-nocfg.cpp

@@ -769,4 +769,11 @@ const int& test12(Span<int> a) {
   return a.getFieldNoLB(); // OK.
 }
 
+void test13() {
+  // FIXME: RHS is Owner<Pointer>, we skip this case to avoid false positives.
+  std::optional<Span<int*>> abc = std::vector<int*>{};
+
+  std::optional<Span<int>> t = std::vector<int> {}; // expected-warning {{object backing the pointer will be destroyed}}
+}
+
 } // namespace GH100526