Merge pull request swiftlang#76884 from rintaro/astgen-fragilesyntax

rintaro · web-flow · commit 8b3d1eae5431 · 2024-10-07T07:18:24.000-07:00
[ASTGen] Remove all `#if RESILIENT_SWIFT_SYNTAX`
diff --git a/lib/ASTGen/Sources/ASTGen/Decls.swift b/lib/ASTGen/Sources/ASTGen/Decls.swift
@@ -68,10 +68,6 @@ extension ASTGenVisitor {
       return self.generate(typeAliasDecl: node).asDecl
     case .variableDecl(let node):
       return self.generate(variableDecl: node).asDecl
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     return self.generateWithLegacy(node)
   }
@@ -425,10 +421,6 @@ extension ASTGenVisitor {
         accessors: CollectionOfOne(accessor).bridgedArray(in: self),
         rBraceLoc: rightBrace
       )
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
   }
 
@@ -734,10 +726,6 @@ extension ASTGenVisitor {
         } else {
           body.associativity = associativity
         }
-#if RESILIENT_SWIFT_SYNTAX
-      @unknown default:
-        fatalError()
-#endif
       }
     }
 
diff --git a/lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift b/lib/ASTGen/Sources/ASTGen/DiagnosticsBridge.swift
@@ -80,11 +80,6 @@ fileprivate func emitDiagnosticParts(
       replaceStartLoc = bridgedSourceLoc(at: replacementRange.lowerBound)
       replaceEndLoc = bridgedSourceLoc(at: replacementRange.upperBound)
       newText = replacingChildData.newChild.description
-      
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
 
     newText.withBridgedString { bridgedMessage in
@@ -152,9 +147,6 @@ extension DiagnosticSeverity {
     case .note: return .note
     case .warning: return .warning
     case .remark: return .remark
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default: return .error
-#endif
     }
   }
 }
diff --git a/lib/ASTGen/Sources/ASTGen/Exprs.swift b/lib/ASTGen/Sources/ASTGen/Exprs.swift
@@ -186,10 +186,6 @@ extension ASTGenVisitor {
       preconditionFailure("should be handled in generate(sequenceExpr:)")
     case ._canImportExpr, ._canImportVersionInfo:
       preconditionFailure("should not be generated by the parser anymore")
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     preconditionFailure("isExprMigrated() mismatch")
   }
diff --git a/lib/ASTGen/Sources/ASTGen/Generics.swift b/lib/ASTGen/Sources/ASTGen/Generics.swift
@@ -78,10 +78,6 @@ extension ASTGenVisitor {
       case .layoutRequirement(_):
         // FIXME: Implement layout requirement translation.
         fatalError("Translation of layout requirements not implemented!")
-#if RESILIENT_SWIFT_SYNTAX
-      @unknown default:
-        fatalError()
-#endif
       }
     }
 
diff --git a/lib/ASTGen/Sources/ASTGen/Literals.swift b/lib/ASTGen/Sources/ASTGen/Literals.swift
@@ -189,10 +189,6 @@ extension ASTGenVisitor {
         stmts.append(.expr(callExpr.asExpr))
 
         interpolationCount += 1
-      #if RESILIENT_SWIFT_SYNTAX
-      @unknown default:
-        fatalError()
-      #endif
       }
     }
 
@@ -281,10 +277,6 @@ extension ASTGenVisitor {
       colonLocs = elementNodes.lazy
         .map({ self.generateSourceLoc($0.colon) })
         .bridgedArray(in: self)
-    #if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-    #endif
     }
     return .createParsed(
       self.ctx,
diff --git a/lib/ASTGen/Sources/ASTGen/Patterns.swift b/lib/ASTGen/Sources/ASTGen/Patterns.swift
@@ -45,10 +45,6 @@ extension ASTGenVisitor {
       return self.generate(valueBindingPattern: node).asPattern
     case .wildcardPattern(let node):
       return self.generate(wildcardPattern: node).asPattern
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
   }
 
diff --git a/lib/ASTGen/Sources/ASTGen/Stmts.swift b/lib/ASTGen/Sources/ASTGen/Stmts.swift
@@ -51,10 +51,6 @@ extension ASTGenVisitor {
       return self.generate(whileStmt: node).asStmt
     case .yieldStmt(let node):
       return self.generate(yieldStmt: node).asStmt
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     return self.generateWithLegacy(node)
   }
@@ -68,10 +64,6 @@ extension ASTGenVisitor {
       return .stmt(self.generate(stmt: node))
     case .expr(let node):
       return .expr(self.generate(expr: node))
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
   }
 
@@ -173,10 +165,6 @@ extension ASTGenVisitor {
         pattern: pat,
         initializer: initializer
       )
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
   }
 
@@ -338,10 +326,6 @@ extension ASTGenVisitor {
           return self.generate(codeBlock: node).asStmt
         case .ifExpr(let node):
           return self.generateIfStmt(ifExpr: node).asStmt
-#if RESILIENT_SWIFT_SYNTAX
-        @unknown default:
-          fatalError()
-#endif
         }
       }.asNullable
     )
@@ -459,10 +443,6 @@ extension ASTGenVisitor {
       )
       items = CollectionOfOne(item).bridgedArray(in: self)
       terminatorLoc = self.generateSourceLoc(node.colon)
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     let body = BridgedBraceStmt.createParsed(
       self.ctx,
@@ -548,10 +528,6 @@ extension ASTGenVisitor {
       lParenLoc = nil
       rParenLoc = nil
       yields = CollectionOfOne(self.generate(expr: node)).bridgedArray(in: self)
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     return .createParsed(
       self.ctx,
diff --git a/lib/ASTGen/Sources/ASTGen/Types.swift b/lib/ASTGen/Sources/ASTGen/Types.swift
@@ -101,10 +101,6 @@ extension ASTGenVisitor {
       return self.generate(suppressedType: node).asTypeRepr
     case .tupleType(let node):
       return self.generate(tupleType: node).asTypeRepr
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
     preconditionFailure("isTypeMigrated() mismatch")
   }
diff --git a/lib/ASTGen/Sources/Macros/Macros.swift b/lib/ASTGen/Sources/Macros/Macros.swift
@@ -378,10 +378,6 @@ func checkMacroDefinition(
       numGenericReplacementsPtr.pointee = genericReplacements.count
 
       return Int(BridgedMacroDefinitionKind.expandedMacro.rawValue)
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default:
-      fatalError()
-#endif
     }
   } catch let errDiags as DiagnosticsError {
     for diag in errDiags.diagnostics {
@@ -506,9 +502,6 @@ func expandFreestandingMacroImpl(
   case .expression: pluginMacroRole = .expression
   case .declaration: pluginMacroRole = .declaration
   case .codeItem: pluginMacroRole = .codeItem
-#if RESILIENT_SWIFT_SYNTAX
-  @unknown default: fatalError()
-#endif
   }
 
   // Send the message.
@@ -684,11 +677,6 @@ func expandAttachedMacroImpl(
     .declaration,
     .codeItem:
     preconditionFailure("unhandled macro role for attached macro")
-
-#if RESILIENT_SWIFT_SYNTAX
-  @unknown default:
-    fatalError()
-#endif
   }
 
   // Prepare syntax nodes to transfer.
diff --git a/lib/ASTGen/Sources/Macros/PluginHost.swift b/lib/ASTGen/Sources/Macros/PluginHost.swift
@@ -268,9 +268,6 @@ class PluginDiagnosticsEngine {
     case .note: bridgedSeverity = .note
     case .warning: bridgedSeverity = .warning
     case .remark: bridgedSeverity = .remark
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default: bridgedSeverity = .error
-#endif
     }
 
     // Emit the diagnostic
diff --git a/lib/ASTGen/Sources/Macros/SourceManager.swift b/lib/ASTGen/Sources/Macros/SourceManager.swift
@@ -215,11 +215,6 @@ extension SourceManager {
           at: replacementRange.upperBound
         )
         newText = replacingChildData.newChild.description
-
-#if RESILIENT_SWIFT_SYNTAX
-      @unknown default:
-        fatalError()
-#endif
       }
 
       newText.withBridgedString { bridgedMessage in
diff --git a/lib/ASTGen/Sources/SwiftIDEUtilsBridging/NameMatcherBridging.swift b/lib/ASTGen/Sources/SwiftIDEUtilsBridging/NameMatcherBridging.swift
@@ -53,9 +53,6 @@ fileprivate extension IDEBridging.LabelRangeType {
     case .enumCaseParameters: self = .EnumCaseParam
     case .noncollapsibleParameters: self = .NoncollapsibleParam
     case .selector: self = .CompoundName
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default: fatalError()
-#endif
     }
   }
 }
@@ -76,9 +73,6 @@ extension BridgedResolvedLoc {
     case .enumCaseParameters(let arguments2): arguments = arguments2
     case .noncollapsibleParameters(let arguments2): arguments = arguments2
     case .selector(let arguments2): arguments = arguments2
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default: fatalError()
-#endif
     }
     self.init(
       range: BridgedCharSourceRange(from: resolvedLoc.baseNameRange, in: sourceFile),
@@ -98,9 +92,6 @@ fileprivate extension IDEBridging.ResolvedLocContext {
     case .selector: self = .Selector
     case .comment: self = .Comment
     case .stringLiteral: self = .StringLiteral
-#if RESILIENT_SWIFT_SYNTAX
-    @unknown default: fatalError()
-#endif
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,6 @@ extension ASTGenVisitor {`
`68`	`68`	`return self.generate(typeAliasDecl: node).asDecl`
`69`	`69`	`case .variableDecl(let node):`
`70`	`70`	`return self.generate(variableDecl: node).asDecl`
`71`		`-#if RESILIENT_SWIFT_SYNTAX`
`72`		`- @unknown default:`
`73`		`- fatalError()`
`74`		`-#endif`
`75`	`71`	`}`
`76`	`72`	`return self.generateWithLegacy(node)`
`77`	`73`	`}`
`@@ -425,10 +421,6 @@ extension ASTGenVisitor {`
`425`	`421`	`accessors: CollectionOfOne(accessor).bridgedArray(in: self),`
`426`	`422`	`rBraceLoc: rightBrace`
`427`	`423`	`)`
`428`		`-#if RESILIENT_SWIFT_SYNTAX`
`429`		`- @unknown default:`
`430`		`- fatalError()`
`431`		`-#endif`
`432`	`424`	`}`
`433`	`425`	`}`
`434`	`426`
`@@ -734,10 +726,6 @@ extension ASTGenVisitor {`
`734`	`726`	`} else {`
`735`	`727`	`body.associativity = associativity`
`736`	`728`	`}`
`737`		`-#if RESILIENT_SWIFT_SYNTAX`
`738`		`- @unknown default:`
`739`		`- fatalError()`
`740`		`-#endif`
`741`	`729`	`}`
`742`	`730`	`}`
`743`	`731`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,6 @@ fileprivate func emitDiagnosticParts(`
`80`	`80`	`replaceStartLoc = bridgedSourceLoc(at: replacementRange.lowerBound)`
`81`	`81`	`replaceEndLoc = bridgedSourceLoc(at: replacementRange.upperBound)`
`82`	`82`	`newText = replacingChildData.newChild.description`
`83`		`-`
`84`		`-#if RESILIENT_SWIFT_SYNTAX`
`85`		`- @unknown default:`
`86`		`- fatalError()`
`87`		`-#endif`
`88`	`83`	`}`
`89`	`84`
`90`	`85`	`newText.withBridgedString { bridgedMessage in`
`@@ -152,9 +147,6 @@ extension DiagnosticSeverity {`
`152`	`147`	`case .note: return .note`
`153`	`148`	`case .warning: return .warning`
`154`	`149`	`case .remark: return .remark`
`155`		`-#if RESILIENT_SWIFT_SYNTAX`
`156`		`- @unknown default: return .error`
`157`		`-#endif`
`158`	`150`	`}`
`159`	`151`	`}`
`160`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,6 @@ extension ASTGenVisitor {`
`186`	`186`	`preconditionFailure("should be handled in generate(sequenceExpr:)")`
`187`	`187`	`case ._canImportExpr, ._canImportVersionInfo:`
`188`	`188`	`preconditionFailure("should not be generated by the parser anymore")`
`189`		`-#if RESILIENT_SWIFT_SYNTAX`
`190`		`- @unknown default:`
`191`		`- fatalError()`
`192`		`-#endif`
`193`	`189`	`}`
`194`	`190`	`preconditionFailure("isExprMigrated() mismatch")`
`195`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,6 @@ extension ASTGenVisitor {`
`78`	`78`	`case .layoutRequirement(_):`
`79`	`79`	`// FIXME: Implement layout requirement translation.`
`80`	`80`	`fatalError("Translation of layout requirements not implemented!")`
`81`		`-#if RESILIENT_SWIFT_SYNTAX`
`82`		`- @unknown default:`
`83`		`- fatalError()`
`84`		`-#endif`
`85`	`81`	`}`
`86`	`82`	`}`
`87`	`83`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,6 @@ extension ASTGenVisitor {`
`189`	`189`	`stmts.append(.expr(callExpr.asExpr))`
`190`	`190`
`191`	`191`	`interpolationCount += 1`
`192`		`- #if RESILIENT_SWIFT_SYNTAX`
`193`		`- @unknown default:`
`194`		`- fatalError()`
`195`		`- #endif`
`196`	`192`	`}`
`197`	`193`	`}`
`198`	`194`
`@@ -281,10 +277,6 @@ extension ASTGenVisitor {`
`281`	`277`	`colonLocs = elementNodes.lazy`
`282`	`278`	`.map({ self.generateSourceLoc($0.colon) })`
`283`	`279`	`.bridgedArray(in: self)`
`284`		`- #if RESILIENT_SWIFT_SYNTAX`
`285`		`- @unknown default:`
`286`		`- fatalError()`
`287`		`- #endif`
`288`	`280`	`}`
`289`	`281`	`return .createParsed(`
`290`	`282`	`self.ctx,`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,6 @@ extension ASTGenVisitor {`
`45`	`45`	`return self.generate(valueBindingPattern: node).asPattern`
`46`	`46`	`case .wildcardPattern(let node):`
`47`	`47`	`return self.generate(wildcardPattern: node).asPattern`
`48`		`-#if RESILIENT_SWIFT_SYNTAX`
`49`		`- @unknown default:`
`50`		`- fatalError()`
`51`		`-#endif`
`52`	`48`	`}`
`53`	`49`	`}`
`54`	`50`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,6 @@ extension ASTGenVisitor {`
`51`	`51`	`return self.generate(whileStmt: node).asStmt`
`52`	`52`	`case .yieldStmt(let node):`
`53`	`53`	`return self.generate(yieldStmt: node).asStmt`
`54`		`-#if RESILIENT_SWIFT_SYNTAX`
`55`		`- @unknown default:`
`56`		`- fatalError()`
`57`		`-#endif`
`58`	`54`	`}`
`59`	`55`	`return self.generateWithLegacy(node)`
`60`	`56`	`}`
`@@ -68,10 +64,6 @@ extension ASTGenVisitor {`
`68`	`64`	`return .stmt(self.generate(stmt: node))`
`69`	`65`	`case .expr(let node):`
`70`	`66`	`return .expr(self.generate(expr: node))`
`71`		`-#if RESILIENT_SWIFT_SYNTAX`
`72`		`- @unknown default:`
`73`		`- fatalError()`
`74`		`-#endif`
`75`	`67`	`}`
`76`	`68`	`}`
`77`	`69`
`@@ -173,10 +165,6 @@ extension ASTGenVisitor {`
`173`	`165`	`pattern: pat,`
`174`	`166`	`initializer: initializer`
`175`	`167`	`)`
`176`		`-#if RESILIENT_SWIFT_SYNTAX`
`177`		`- @unknown default:`
`178`		`- fatalError()`
`179`		`-#endif`
`180`	`168`	`}`
`181`	`169`	`}`
`182`	`170`
`@@ -338,10 +326,6 @@ extension ASTGenVisitor {`
`338`	`326`	`return self.generate(codeBlock: node).asStmt`
`339`	`327`	`case .ifExpr(let node):`
`340`	`328`	`return self.generateIfStmt(ifExpr: node).asStmt`
`341`		`-#if RESILIENT_SWIFT_SYNTAX`
`342`		`- @unknown default:`
`343`		`- fatalError()`
`344`		`-#endif`
`345`	`329`	`}`
`346`	`330`	`}.asNullable`
`347`	`331`	`)`
`@@ -459,10 +443,6 @@ extension ASTGenVisitor {`
`459`	`443`	`)`
`460`	`444`	`items = CollectionOfOne(item).bridgedArray(in: self)`
`461`	`445`	`terminatorLoc = self.generateSourceLoc(node.colon)`
`462`		`-#if RESILIENT_SWIFT_SYNTAX`
`463`		`- @unknown default:`
`464`		`- fatalError()`
`465`		`-#endif`
`466`	`446`	`}`
`467`	`447`	`let body = BridgedBraceStmt.createParsed(`
`468`	`448`	`self.ctx,`
`@@ -548,10 +528,6 @@ extension ASTGenVisitor {`
`548`	`528`	`lParenLoc = nil`
`549`	`529`	`rParenLoc = nil`
`550`	`530`	`yields = CollectionOfOne(self.generate(expr: node)).bridgedArray(in: self)`
`551`		`-#if RESILIENT_SWIFT_SYNTAX`
`552`		`- @unknown default:`
`553`		`- fatalError()`
`554`		`-#endif`
`555`	`531`	`}`
`556`	`532`	`return .createParsed(`
`557`	`533`	`self.ctx,`
Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,6 @@ extension ASTGenVisitor {`
`101`	`101`	`return self.generate(suppressedType: node).asTypeRepr`
`102`	`102`	`case .tupleType(let node):`
`103`	`103`	`return self.generate(tupleType: node).asTypeRepr`
`104`		`-#if RESILIENT_SWIFT_SYNTAX`
`105`		`- @unknown default:`
`106`		`- fatalError()`
`107`		`-#endif`
`108`	`104`	`}`
`109`	`105`	`preconditionFailure("isTypeMigrated() mismatch")`
`110`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,6 @@ class PluginDiagnosticsEngine {`
`268`	`268`	`case .note: bridgedSeverity = .note`
`269`	`269`	`case .warning: bridgedSeverity = .warning`
`270`	`270`	`case .remark: bridgedSeverity = .remark`
`271`		`-#if RESILIENT_SWIFT_SYNTAX`
`272`		`- @unknown default: bridgedSeverity = .error`
`273`		`-#endif`
`274`	`271`	`}`
`275`	`272`
`276`	`273`	`// Emit the diagnostic`
Original file line number	Diff line number	Diff line change
`@@ -215,11 +215,6 @@ extension SourceManager {`
`215`	`215`	`at: replacementRange.upperBound`
`216`	`216`	`)`
`217`	`217`	`newText = replacingChildData.newChild.description`
`218`		`-`
`219`		`-#if RESILIENT_SWIFT_SYNTAX`
`220`		`- @unknown default:`
`221`		`- fatalError()`
`222`		`-#endif`
`223`	`218`	`}`
`224`	`219`
`225`	`220`	`newText.withBridgedString { bridgedMessage in`