Avoid goto

Author: ApolloZhu

lib/AST/ASTScopeCreation.cpp

@@ -268,18 +268,24 @@ ASTSourceFileScope::ASTSourceFileScope(SourceFile *SF,
       scopeCreator(scopeCreator) {
   if (auto enclosingSF = SF->getEnclosingSourceFile()) {
     SourceLoc parentLoc;
-    auto macroRole = SF->getFulfilledMacroRole();
-
-    // Determine the parent source location based on the macro role.
-    AbstractFunctionDecl *bodyForDecl = nullptr;
 
     if (SF->Kind == SourceFileKind::DefaultArgument) {
       auto genInfo = *SF->getASTContext().SourceMgr.getGeneratedSourceInfo(
           *SF->getBufferID());
       parentLoc = ASTNode::getFromOpaqueValue(genInfo.astNode).getStartLoc();
-      goto setParent;
+      if (auto parentScope =
+              findStartingScopeForLookup(enclosingSF, parentLoc)) {
+        parentAndWasExpanded.setPointer(
+            const_cast<ASTScopeImpl *>(parentScope));
+      }
+      return;
     }
 
+    auto macroRole = SF->getFulfilledMacroRole();
+
+    // Determine the parent source location based on the macro role.
+    AbstractFunctionDecl *bodyForDecl = nullptr;
+
     switch (*macroRole) {
     case MacroRole::Expression:
     case MacroRole::Declaration:
@@ -309,7 +315,6 @@ ASTSourceFileScope::ASTSourceFileScope(SourceFile *SF,
     }
     }
 
-  setParent:
     if (auto parentScope = findStartingScopeForLookup(enclosingSF, parentLoc)) {
       if (bodyForDecl) {
         auto bodyScope = new (bodyForDecl->getASTContext()) FunctionBodyScope(bodyForDecl);