[cxx-interop][SwiftCompilerSources] Use swift::BuiltinValueKind instead of BridgedBuiltinID

rdar://83361087

Author: egorzhdan

SwiftCompilerSources/Sources/Optimizer/ModulePasses/StackProtection.swift

@@ -124,7 +124,7 @@ private struct StackProtectionOptimization {
                                 mustFixStackNesting: inout Bool, _ context: PassContext) {
 
     // `withUnsafeTemporaryAllocation(of:capacity:_:)` is compiled to a `builtin "stackAlloc"`.
-    if let bi = instruction as? BuiltinInst, bi.id == .stackAlloc {
+    if let bi = instruction as? BuiltinInst, bi.id == .StackAlloc {
       function.setNeedsStackProtection(context)
       return
     }

SwiftCompilerSources/Sources/Optimizer/Utilities/EscapeUtils.swift

@@ -422,7 +422,7 @@ fileprivate struct EscapeWalker<V: EscapeVisitor> : ValueDefUseWalker,
       return walkDownUses(ofAddress: pta, path: path.with(knownType: nil))
     case let bi as BuiltinInst:
       switch bi.id {
-      case .destroyArray:
+      case .DestroyArray:
         // If it's not the array base pointer operand -> bail. Though, that shouldn't happen
         // because the other operands (metatype, count) shouldn't be visited anyway.
         if operand.index != 1 { return isEscaping }

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -319,19 +319,10 @@ final public class LoadUnownedInst : SingleValueInstruction, UnaryInstruction {}
 final public class LoadBorrowInst : SingleValueInstruction, UnaryInstruction {}
 
 final public class BuiltinInst : SingleValueInstruction {
-  // TODO: find a way to directly reuse the BuiltinValueKind enum
-  public enum ID  {
-    case none
-    case destroyArray
-    case stackAlloc
-  }
+  public typealias ID = swift.BuiltinValueKind
 
   public var id: ID {
-    switch BuiltinInst_getID(bridged) {
-      case DestroyArrayBuiltin: return .destroyArray
-      case StackAllocBuiltin: return .stackAlloc
-      default: return .none
-    }
+    return BuiltinInst_getID(bridged)
   }
 }
 

include/swift/SIL/SILBridging.h

@@ -15,6 +15,7 @@
 
 #include "swift/Basic/BasicBridging.h"
 #include "swift/Basic/BridgedSwiftObject.h"
+#include "swift/AST/Builtins.h"
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/SIL/SILLocation.h"
 #include <stdbool.h>
@@ -203,12 +204,6 @@ typedef enum {
 
 // AST bridging
 
-typedef enum {
-  UnknownBuiltin = 0,
-#define BUILTIN(Id, Name, Attrs) Id##Builtin,
-#include "swift/AST/Builtins.def"
-} BridgedBuiltinID;
-
 struct BridgedEffectInfo {
   SwiftInt argumentIndex;
   bool isDerived;
@@ -352,7 +347,7 @@ BridgedMultiValueResult
 BridgedArrayRef TermInst_getSuccessors(BridgedInstruction term);
 
 llvm::StringRef CondFailInst_getMessage(BridgedInstruction cfi);
-BridgedBuiltinID BuiltinInst_getID(BridgedInstruction bi);
+swift::BuiltinValueKind BuiltinInst_getID(BridgedInstruction bi);
 SwiftInt AddressToPointerInst_needsStackProtection(BridgedInstruction atp);
 SwiftInt IndexAddrInst_needsStackProtection(BridgedInstruction ia);
 BridgedGlobalVar GlobalAccessInst_getGlobal(BridgedInstruction globalInst);

include/swift/module.modulemap

@@ -8,9 +8,13 @@ module BasicBridging {
 
 module ASTBridging {
   header "AST/ASTBridging.h"
+  header "AST/Builtins.h"
   header "AST/DiagnosticEngine.h"
   header "AST/DiagnosticConsumer.h"
   header "AST/SubstitutionMap.h"
+
+  textual header "AST/Builtins.def"
+
   requires cplusplus
   export *
 }

lib/SIL/Utils/SILBridging.cpp

@@ -751,8 +751,8 @@ llvm::StringRef CondFailInst_getMessage(BridgedInstruction cfi) {
   return castToInst<CondFailInst>(cfi)->getMessage();
 }
 
-BridgedBuiltinID BuiltinInst_getID(BridgedInstruction bi) {
-  return (BridgedBuiltinID)castToInst<BuiltinInst>(bi)->getBuiltinInfo().ID;
+BuiltinValueKind BuiltinInst_getID(BridgedInstruction bi) {
+  return castToInst<BuiltinInst>(bi)->getBuiltinInfo().ID;
 }
 
 SwiftInt AddressToPointerInst_needsStackProtection(BridgedInstruction atp) {