[AST] Abstract away a couple of bridging wrappers

Move these into ASTBridgingWrappers.def.

Author: hamishknight

include/swift/AST/ASTBridging.h

@@ -125,9 +125,6 @@ typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedDiagID : uint32_t {
 #include "swift/AST/DiagnosticsAll.def"
 } BridgedDiagID;
 
-BRIDGING_WRAPPER_NONNULL(DiagnosticEngine)
-BRIDGING_WRAPPER_NULLABLE(DiagnosticEngine)
-
 class BridgedDiagnosticArgument {
   int64_t storage[3];
 
@@ -367,10 +364,6 @@ typedef struct BridgedASTNode {
   ASTNodeKind kind;
 } BridgedASTNode;
 
-typedef struct BridgedTypeAttributes {
-  void *_Nonnull raw;
-} BridgedTypeAttributes;
-
 struct BridgedIdentifierAndSourceLoc {
   BridgedIdentifier name;
   BridgedSourceLoc nameLoc;

include/swift/AST/ASTBridgingWrappers.def

@@ -67,6 +67,10 @@ AST_BRIDGING_WRAPPER_NULLABLE(TypeRepr)
 AST_BRIDGING_WRAPPER_NULLABLE(GenericParamList)
 AST_BRIDGING_WRAPPER_NULLABLE(TrailingWhereClause)
 AST_BRIDGING_WRAPPER_NULLABLE(ParameterList)
+AST_BRIDGING_WRAPPER_NONNULL(TypeAttributes)
+
+// Non-AST types to generate wrappers for.
+AST_BRIDGING_WRAPPER_NULLABLE(DiagnosticEngine)
 
 #undef AST_BRIDGING_WRAPPER_NONNULL
 #undef AST_BRIDGING_WRAPPER_NULLABLE

lib/AST/ASTBridging.cpp

@@ -233,14 +233,6 @@ static inline BridgedDiagnosticImpl *unbridged(BridgedDiagnostic cDiag) {
   return static_cast<BridgedDiagnosticImpl *>(cDiag.raw);
 }
 
-static inline DiagnosticEngine &unbridged(BridgedDiagnosticEngine cEngine) {
-  return *cEngine.get();
-}
-
-static inline TypeAttributes *unbridged(BridgedTypeAttributes cAttributes) {
-  return static_cast<TypeAttributes *>(cAttributes.raw);
-}
-
 static TypeAttrKind unbridged(BridgedTypeAttrKind kind) {
   switch (kind) {
 #define TYPE_ATTR(X)                                                           \
@@ -281,7 +273,7 @@ BridgedDiagnostic Diagnostic_create(BridgedSourceLoc cLoc,
     break;
   }
 
-  DiagnosticEngine &diags = unbridged(cDiags);
+  DiagnosticEngine &diags = *unbridged(cDiags);
   return {new BridgedDiagnosticImpl{diags.diagnose(loc, diagID, text), {text}}};
 }