ASTBridging: Bridge swift::LayoutConstraintKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -24,6 +24,7 @@
 #include "swift/AST/AttrKind.h"
 #include "swift/AST/DiagnosticKind.h"
 #include "swift/AST/DiagnosticList.h"
+#include "swift/AST/LayoutConstraintKind.h"
 #include "swift/Basic/BasicBridging.h"
 
 #ifdef USED_IN_CPP_SOURCE
@@ -2851,19 +2852,6 @@ BridgedIdentifier BridgedPattern_getBoundName(BridgedPattern cPattern);
 // MARK: Generics
 //===----------------------------------------------------------------------===//
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedLayoutConstraintKind {
-  BridgedLayoutConstraintKindUnknownLayout,
-  BridgedLayoutConstraintKindTrivialOfExactSize,
-  BridgedLayoutConstraintKindTrivialOfAtMostSize,
-  BridgedLayoutConstraintKindTrivial,
-  BridgedLayoutConstraintKindClass,
-  BridgedLayoutConstraintKindNativeClass,
-  BridgedLayoutConstraintKindRefCountedObject,
-  BridgedLayoutConstraintKindNativeRefCountedObject,
-  BridgedLayoutConstraintKindBridgeObject,
-  BridgedLayoutConstraintKindTrivialStride,
-};
-
 class BridgedLayoutConstraint {
   swift::LayoutConstraintInfo *_Nullable raw;
 
@@ -2879,19 +2867,19 @@ class BridgedLayoutConstraint {
 
   SWIFT_NAME("init(_:kind:)")
   BridgedLayoutConstraint(BridgedASTContext cContext,
-                          BridgedLayoutConstraintKind cKind);
+                          swift::LayoutConstraintKind kind);
 
   SWIFT_NAME("init(_:kind:size:alignment:)")
   BridgedLayoutConstraint(BridgedASTContext cContext,
-                          BridgedLayoutConstraintKind cKind, size_t size,
+                          swift::LayoutConstraintKind kind, size_t size,
                           size_t alignment);
 
   BRIDGED_INLINE
   SWIFT_COMPUTED_PROPERTY
   bool getIsNull() const;
 
   SWIFT_COMPUTED_PROPERTY
-  BridgedLayoutConstraintKind getKind() const;
+  swift::LayoutConstraintKind getKind() const;
 
   BRIDGED_INLINE
   SWIFT_COMPUTED_PROPERTY

include/swift/AST/LayoutConstraintKind.h

@@ -2,48 +2,47 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//
-// This file defines types and APIs for layout constraints.
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstdint>
 
 #ifndef SWIFT_LAYOUT_CONSTRAINTKIND_H
 #define SWIFT_LAYOUT_CONSTRAINTKIND_H
 
+/// This header is included in a bridging header. Be *very* careful with what
+/// you include here! See include caveats in `ASTBridging.h`.
+#include "swift/Basic/SwiftBridging.h"
+#include <stdint.h>
+
 namespace swift {
 /// Describes a layout constraint information.
-enum class LayoutConstraintKind : uint8_t {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) LayoutConstraintKind : uint8_t {
   // It is not a known layout constraint.
-  UnknownLayout,
+  UnknownLayout SWIFT_NAME("unknownLayout"),
   // It is a layout constraint representing a trivial type of a known size.
-  TrivialOfExactSize,
+  TrivialOfExactSize SWIFT_NAME("trivialOfExactSize"),
   // It is a layout constraint representing a trivial type of a size known to
   // be no larger than a given size.
-  TrivialOfAtMostSize,
+  TrivialOfAtMostSize SWIFT_NAME("trivialOfAtMostSize"),
   // It is a layout constraint representing a trivial type of an unknown size.
-  Trivial,
+  Trivial SWIFT_NAME("trivial"),
   // It is a layout constraint representing a reference counted class instance.
-  Class,
+  Class SWIFT_NAME("class"),
   // It is a layout constraint representing a reference counted native class
   // instance.
-  NativeClass,
+  NativeClass SWIFT_NAME("nativeClass"),
   // It is a layout constraint representing a reference counted object.
-  RefCountedObject,
+  RefCountedObject SWIFT_NAME("refCountedObject"),
   // It is a layout constraint representing a native reference counted object.
-  NativeRefCountedObject,
+  NativeRefCountedObject SWIFT_NAME("nativeRefCountedObject"),
   // It is a layout constraint representing a bridge object
-  BridgeObject,
+  BridgeObject SWIFT_NAME("bridgeObject"),
   // It is a layout constraint representing a trivial type of a known stride.
-  TrivialStride,
+  TrivialStride SWIFT_NAME("trivialStride"),
   LastLayout = TrivialStride,
 };
 } // namespace swift

lib/AST/Bridging/GenericsBridging.cpp

@@ -157,61 +157,22 @@ BridgedRequirementRepr BridgedRequirementRepr_createLayoutConstraint(
   };
 }
 
-static swift::LayoutConstraintKind
-unbridged(BridgedLayoutConstraintKind cKind) {
-  switch (cKind) {
-#define CASE(Kind)                                                             \
-  case BridgedLayoutConstraintKind##Kind:                                      \
-    return swift::LayoutConstraintKind::Kind;
-    CASE(UnknownLayout)
-    CASE(TrivialOfExactSize)
-    CASE(TrivialOfAtMostSize)
-    CASE(Trivial)
-    CASE(Class)
-    CASE(NativeClass)
-    CASE(RefCountedObject)
-    CASE(NativeRefCountedObject)
-    CASE(BridgeObject)
-    CASE(TrivialStride)
-#undef CASE
-  }
-}
-
-static BridgedLayoutConstraintKind bridge(swift::LayoutConstraintKind kind) {
-  switch (kind) {
-#define CASE(Kind)                                                             \
-  case swift::LayoutConstraintKind::Kind:                                      \
-    return BridgedLayoutConstraintKind##Kind;
-    CASE(UnknownLayout)
-    CASE(TrivialOfExactSize)
-    CASE(TrivialOfAtMostSize)
-    CASE(Trivial)
-    CASE(Class)
-    CASE(NativeClass)
-    CASE(RefCountedObject)
-    CASE(NativeRefCountedObject)
-    CASE(BridgeObject)
-    CASE(TrivialStride)
-#undef CASE
-  }
-}
-
 BridgedLayoutConstraint::BridgedLayoutConstraint(BridgedASTContext cContext,
                                                  BridgedIdentifier cID)
     : BridgedLayoutConstraint(
           swift::getLayoutConstraint(cID.unbridged(), cContext.unbridged())) {}
 
 BridgedLayoutConstraint::BridgedLayoutConstraint(
-    BridgedASTContext cContext, BridgedLayoutConstraintKind cKind)
-    : BridgedLayoutConstraint(LayoutConstraint::getLayoutConstraint(
-          ::unbridged(cKind), cContext.unbridged())) {}
+    BridgedASTContext cContext, swift::LayoutConstraintKind kind)
+    : BridgedLayoutConstraint(
+          LayoutConstraint::getLayoutConstraint(kind, cContext.unbridged())) {}
 
 BridgedLayoutConstraint::BridgedLayoutConstraint(
-    BridgedASTContext cContext, BridgedLayoutConstraintKind cKind, size_t size,
+    BridgedASTContext cContext, swift::LayoutConstraintKind kind, size_t size,
     size_t alignment)
     : BridgedLayoutConstraint(LayoutConstraint::getLayoutConstraint(
-          ::unbridged(cKind), size, alignment, cContext.unbridged())) {}
+          kind, size, alignment, cContext.unbridged())) {}
 
-BridgedLayoutConstraintKind BridgedLayoutConstraint::getKind() const {
-  return bridge(unbridged()->getKind());
+swift::LayoutConstraintKind BridgedLayoutConstraint::getKind() const {
+  return unbridged()->getKind();
 }