AST: Adopt modern assertions in AvailabilityScope.

Author: tshortli

lib/AST/AvailabilityScope.cpp

@@ -44,17 +44,17 @@ AvailabilityScope::AvailabilityScope(ASTContext &Ctx, IntroNode Node,
                                      const AvailabilityContext Info)
     : Node(Node), SrcRange(SrcRange), AvailabilityInfo(Info) {
   if (Parent) {
-    assert(SrcRange.isValid());
+    ASSERT(SrcRange.isValid());
     Parent->addChild(this, Ctx);
-    assert(Info.isContainedIn(Parent->getAvailabilityContext()));
+    DEBUG_ASSERT(Info.isContainedIn(Parent->getAvailabilityContext()));
   }
   Ctx.addDestructorCleanup(Children);
 }
 
 AvailabilityScope *
 AvailabilityScope::createForSourceFile(SourceFile *SF,
                                        const AvailabilityContext Info) {
-  assert(SF);
+  ASSERT(SF);
 
   ASTContext &Ctx = SF->getASTContext();
 
@@ -93,25 +93,25 @@ AvailabilityScope::createForSourceFile(SourceFile *SF,
 AvailabilityScope *AvailabilityScope::createForDecl(
     ASTContext &Ctx, Decl *D, AvailabilityScope *Parent,
     const AvailabilityContext Info, SourceRange SrcRange) {
-  assert(D);
-  assert(Parent);
+  ASSERT(D);
+  ASSERT(Parent);
   return new (Ctx) AvailabilityScope(Ctx, D, Parent, SrcRange, Info);
 }
 
 AvailabilityScope *AvailabilityScope::createForDeclImplicit(
     ASTContext &Ctx, Decl *D, AvailabilityScope *Parent,
     const AvailabilityContext Info, SourceRange SrcRange) {
-  assert(D);
-  assert(Parent);
+  ASSERT(D);
+  ASSERT(Parent);
   return new (Ctx) AvailabilityScope(Ctx, IntroNode(D, Reason::DeclImplicit),
                                      Parent, SrcRange, Info);
 }
 
 AvailabilityScope *AvailabilityScope::createForIfStmtThen(
     ASTContext &Ctx, IfStmt *S, const DeclContext *DC,
     AvailabilityScope *Parent, const AvailabilityContext Info) {
-  assert(S);
-  assert(Parent);
+  ASSERT(S);
+  ASSERT(Parent);
   return new (Ctx)
       AvailabilityScope(Ctx, IntroNode(S, DC, /*IsThen=*/true), Parent,
                         S->getThenStmt()->getSourceRange(), Info);
@@ -120,8 +120,8 @@ AvailabilityScope *AvailabilityScope::createForIfStmtThen(
 AvailabilityScope *AvailabilityScope::createForIfStmtElse(
     ASTContext &Ctx, IfStmt *S, const DeclContext *DC,
     AvailabilityScope *Parent, const AvailabilityContext Info) {
-  assert(S);
-  assert(Parent);
+  ASSERT(S);
+  ASSERT(Parent);
   return new (Ctx)
       AvailabilityScope(Ctx, IntroNode(S, DC, /*IsThen=*/false), Parent,
                         S->getElseStmt()->getSourceRange(), Info);
@@ -131,8 +131,8 @@ AvailabilityScope *AvailabilityScope::createForConditionFollowingQuery(
     ASTContext &Ctx, PoundAvailableInfo *PAI,
     const StmtConditionElement &LastElement, const DeclContext *DC,
     AvailabilityScope *Parent, const AvailabilityContext Info) {
-  assert(PAI);
-  assert(Parent);
+  ASSERT(PAI);
+  ASSERT(Parent);
   SourceRange Range(PAI->getEndLoc(), LastElement.getEndLoc());
   return new (Ctx)
       AvailabilityScope(Ctx, IntroNode(PAI, DC), Parent, Range, Info);
@@ -142,9 +142,9 @@ AvailabilityScope *AvailabilityScope::createForGuardStmtFallthrough(
     ASTContext &Ctx, GuardStmt *RS, BraceStmt *ContainingBraceStmt,
     const DeclContext *DC, AvailabilityScope *Parent,
     const AvailabilityContext Info) {
-  assert(RS);
-  assert(ContainingBraceStmt);
-  assert(Parent);
+  ASSERT(RS);
+  ASSERT(ContainingBraceStmt);
+  ASSERT(Parent);
   SourceRange Range(RS->getEndLoc(), ContainingBraceStmt->getEndLoc());
   return new (Ctx) AvailabilityScope(
       Ctx, IntroNode(RS, DC, /*IsFallthrough=*/true), Parent, Range, Info);
@@ -153,8 +153,8 @@ AvailabilityScope *AvailabilityScope::createForGuardStmtFallthrough(
 AvailabilityScope *AvailabilityScope::createForGuardStmtElse(
     ASTContext &Ctx, GuardStmt *RS, const DeclContext *DC,
     AvailabilityScope *Parent, const AvailabilityContext Info) {
-  assert(RS);
-  assert(Parent);
+  ASSERT(RS);
+  ASSERT(Parent);
   return new (Ctx)
       AvailabilityScope(Ctx, IntroNode(RS, DC, /*IsFallthrough=*/false), Parent,
                         RS->getBody()->getSourceRange(), Info);
@@ -163,14 +163,15 @@ AvailabilityScope *AvailabilityScope::createForGuardStmtElse(
 AvailabilityScope *AvailabilityScope::createForWhileStmtBody(
     ASTContext &Ctx, WhileStmt *S, const DeclContext *DC,
     AvailabilityScope *Parent, const AvailabilityContext Info) {
-  assert(S);
-  assert(Parent);
+  ASSERT(S);
+  ASSERT(Parent);
   return new (Ctx) AvailabilityScope(Ctx, IntroNode(S, DC), Parent,
                                      S->getBody()->getSourceRange(), Info);
 }
 
 void AvailabilityScope::addChild(AvailabilityScope *Child, ASTContext &Ctx) {
-  assert(Child->getSourceRange().isValid());
+  bool validSourceRange = Child->getSourceRange().isValid();
+  ASSERT(validSourceRange);
 
   // Handle the first child.
   if (Children.empty()) {
@@ -200,14 +201,14 @@ void AvailabilityScope::addChild(AvailabilityScope *Child, ASTContext &Ctx) {
 
 AvailabilityScope *
 AvailabilityScope::findMostRefinedSubContext(SourceLoc Loc, ASTContext &Ctx) {
-  assert(Loc.isValid());
+  DEBUG_ASSERT(Loc.isValid());
 
   if (SrcRange.isValid() && !Ctx.SourceMgr.containsTokenLoc(SrcRange, Loc))
     return nullptr;
 
   (void)evaluateOrDefault(Ctx.evaluator,
                           ExpandChildAvailabilityScopesRequest{this}, {});
-  assert(!getNeedsExpansion());
+  DEBUG_ASSERT(!getNeedsExpansion());
 
   // Do a binary search to find the first child with a source range that
   // ends after the given location.