commit 21b74ae65fc67afea9eeb9ebd69b0a3910ed458d
author Stephen Kelly <steveire@gmail.com> Wed Apr 14 19:03:33 2021 +0100
committer Copybara-Service <copybara-worker@google.com> Fri Apr 16 12:12:08 2021 -0700
tree 4b5cbd81606f13d3d8faf9d89a39ea186c69eb16
parent 203f7ab1315fe196263b3191b9f3cb9d9e6d949f

[AST] Replace asserts with a condition

As was done for other locations in commit 54272e5b (NFC:
Replace asserts with if() in SourceLocation accessors, 2019-01-07).

Extracted from  https://reviews.llvm.org/D99231

GitOrigin-RevId: 6559ebd91b70f8d2ed82e19539ee09c5220159c2

include/clang/AST/DeclCXX.h

diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h
index bb99ab1..bbf7ecf 100644
--- a/include/clang/AST/DeclCXX.h
+++ b/include/clang/AST/DeclCXX.h
@@ -2267,7 +2267,8 @@
 
   // For a pack expansion, returns the location of the ellipsis.
   SourceLocation getEllipsisLoc() const {
-    assert(isPackExpansion() && "Initializer is not a pack expansion");
+    if (!isPackExpansion())
+      return {};
     return MemberOrEllipsisLocation;
   }
 

include/clang/AST/TemplateBase.h

diff --git a/include/clang/AST/TemplateBase.h b/include/clang/AST/TemplateBase.h
index 1671637..19f2cad 100644
--- a/include/clang/AST/TemplateBase.h
+++ b/include/clang/AST/TemplateBase.h
@@ -512,7 +512,8 @@
   }
 
   TypeSourceInfo *getTypeSourceInfo() const {
-    assert(Argument.getKind() == TemplateArgument::Type);
+    if (Argument.getKind() != TemplateArgument::Type)
+      return nullptr;
     return LocInfo.getAsTypeSourceInfo();
   }