address PR comments

Author: hnrklssn

clang/lib/Sema/SemaDeclAttr.cpp

@@ -6161,36 +6161,36 @@ getBoundsAttrKind(AttributeCommonInfo::Kind Kind) {
 }
 
 class EarlyLifetimeAndScopeCheck
-    : public StmtVisitor<EarlyLifetimeAndScopeCheck, bool> {
+    : public ConstStmtVisitor<EarlyLifetimeAndScopeCheck, bool> {
   Sema &SemaRef;
   bool ScopeCheck;
   Sema::LifetimeCheckKind LifetimeCheck;
   BoundsAttributedType::BoundsAttrKind AttrKind;
   bool IsArrayType;
-  llvm::SmallPtrSet<Decl *, 16> Visited;
+  llvm::SmallPtrSet<const ValueDecl *, 16> Visited;
 
 public:
   EarlyLifetimeAndScopeCheck(Sema &S, bool SC, Sema::LifetimeCheckKind LC,
                              AttributeCommonInfo::Kind AK, bool IsArray)
       : SemaRef(S), ScopeCheck(SC), LifetimeCheck(LC),
         AttrKind(getBoundsAttrKind(AK)), IsArrayType(IsArray) {}
 
-  bool VisitStmt(Stmt *S) {
+  bool VisitStmt(const Stmt *S) {
     bool HadError = false;
-    for (auto Child : S->children())
+    for (const auto *Child : S->children())
       HadError |= Visit(Child);
     return HadError;
   }
 
-  bool VisitDeclRefExpr(DeclRefExpr *E) {
-    ValueDecl *VD = E->getDecl();
+  bool VisitDeclRefExpr(const DeclRefExpr *E) {
+    const ValueDecl *VD = E->getDecl();
     bool IsNewVD = Visited.insert(VD).second;
     return IsNewVD &&
            CheckArgLifetimeAndScope(SemaRef, VD, E->getExprLoc(), ScopeCheck,
                                     LifetimeCheck, AttrKind, IsArrayType);
   }
 
-  bool VisitMemberExpr(MemberExpr *E) {
+  bool VisitMemberExpr(const MemberExpr *E) {
     bool HadError = Visit(E->getBase());
     ValueDecl *VD = E->getMemberDecl();
     bool IsNewVD = Visited.insert(VD).second;

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -651,30 +651,32 @@ instantiateBoundsSafetyAttr(Sema &S,
   int Level;
   Expr *ArgExpr;
   std::string Spelling;
-  if (auto A = dyn_cast<SizedByAttr>(AL)) {
+  if (const auto *A = dyn_cast<SizedByAttr>(AL)) {
     Level = A->getNestedLevel();
     ArgExpr = A->getSize();
     Spelling = A->getSpelling();
-  } else if (auto A = dyn_cast<SizedByOrNullAttr>(AL)) {
+  } else if (const auto *A = dyn_cast<SizedByOrNullAttr>(AL)) {
     Level = A->getNestedLevel();
     ArgExpr = A->getSize();
     Spelling = A->getSpelling();
-  } else if (auto A = dyn_cast<CountedByAttr>(AL)) {
+  } else if (const auto *A = dyn_cast<CountedByAttr>(AL)) {
     Level = A->getNestedLevel();
     ArgExpr = A->getCount();
     Spelling = A->getSpelling();
-  } else if (auto A = dyn_cast<CountedByOrNullAttr>(AL)) {
+  } else if (const auto *A = dyn_cast<CountedByOrNullAttr>(AL)) {
     Level = A->getNestedLevel();
     ArgExpr = A->getCount();
     Spelling = A->getSpelling();
-  } else if (auto A = dyn_cast<PtrEndedByAttr>(AL)) {
+  } else if (const auto *A = dyn_cast<PtrEndedByAttr>(AL)) {
     Level = A->getNestedLevel();
     ArgExpr = A->getEndPtr();
     Spelling = A->getSpelling();
   } else
     llvm_unreachable("unexpected late instantiated bounds safety attribute");
 
   ExprResult InstantiatedArgExpr = S.SubstExpr(ArgExpr, TemplateArgs);
+  if (InstantiatedArgExpr.isInvalid())
+    return;
   S.applyPtrCountedByEndedByAttr(
       New, Level, AL->getParsedKind(), InstantiatedArgExpr.get(), AL->getLoc(),
       AL->getRange(), "\'" + Spelling + "\'", /*from API notes*/ false,