Merge pull request #14684 from davezarzycki/nfc_workaround_clang_perf

Author: swift-ci

lib/AST/Builtins.cpp

@@ -1604,11 +1604,11 @@ ValueDecl *swift::getBuiltinValueDecl(ASTContext &Context, Identifier Id) {
     return getAllocWithTailElemsOperation(Context, Id, NumTailTypes);
   }
 
-  BuiltinValueKind BV = llvm::StringSwitch<BuiltinValueKind>(OperationName)
+  auto BV = BuiltinValueKind::None;
 #define BUILTIN(id, name, Attrs) \
-       .Case(name, BuiltinValueKind::id)
+  if (name == OperationName) { BV = BuiltinValueKind::id; } else
 #include "swift/AST/Builtins.def"
-       .Default(BuiltinValueKind::None);
+  /* final "else" */ {}
 
   // Filter out inappropriate overloads.
   OverloadedBuiltinKind OBK = OverloadedBuiltinKinds[unsigned(BV)];

lib/SIL/SILModule.cpp

@@ -455,11 +455,10 @@ const BuiltinInfo &SILModule::getBuiltinInfo(Identifier ID) {
     Info.ID = BuiltinValueKind::AllocWithTailElems;
   else {
     // Switch through the rest of builtins.
-    Info.ID = llvm::StringSwitch<BuiltinValueKind>(OperationName)
-#define BUILTIN(ID, Name, Attrs) \
-      .Case(Name, BuiltinValueKind::ID)
+#define BUILTIN(Id, Name, Attrs) \
+    if (OperationName == Name) { Info.ID = BuiltinValueKind::Id; } else
 #include "swift/AST/Builtins.def"
-      .Default(BuiltinValueKind::None);
+    /* final "else" */ { Info.ID = BuiltinValueKind::None; }
   }
 
   return Info;