[ASTGen] Use UTF-8 rather than C char, and use BridgedIdentifier consistently

DougGregor · DougGregor · commit 7483373326ea · 2022-10-07T10:19:06.000-07:00
diff --git a/include/swift/AST/CASTBridging.h b/include/swift/AST/CASTBridging.h
@@ -13,6 +13,8 @@
 #ifndef SWIFT_C_AST_ASTBRIDGING_H
 #define SWIFT_C_AST_ASTBRIDGING_H
 
+#include <inttypes.h>
+
 #if __clang__
 // Provide macros to temporarily suppress warning about the use of
 // _Nullable and _Nonnull.
@@ -26,6 +28,7 @@
 #else
 #define SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 #define SWIFT_END_NULLABILITY_ANNOTATIONS
+#define _Nullable
 #endif
 
 //===----------------------------------------------------------------------===//
@@ -73,7 +76,7 @@ void DiagnosticEngine_diagnose(void *, void *loc, BridgedDiagID diagID,
 
 int DiagnosticEngine_hadAnyError(void *);
 
-typedef const char *BridgedIdentifier;
+typedef void *BridgedIdentifier;
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,7 +86,8 @@ extern "C" {
 #endif
 
 BridgedIdentifier
-SwiftASTContext_getIdentifier(void *ctx, const char *_Nullable str, long len);
+SwiftASTContext_getIdentifier(
+    void *ctx, const uint8_t * _Nullable str, long len);
 
 void *SwiftImportDecl_create(void *, void *, void *, char, void *,
                              BridgedArrayRef, BridgedArrayRef);
@@ -100,17 +104,17 @@ void *SwiftTupleExpr_create(void *ctx, void *lparen, BridgedArrayRef subs,
 
 void *SwiftFunctionCallExpr_create(void *ctx, void *fn, void *args);
 
-void *SwiftIdentifierExpr_create(void *ctx, const char *base, void *loc);
+void *SwiftIdentifierExpr_create(void *ctx, BridgedIdentifier base, void *loc);
 
-void *SwiftStringLiteralExpr_create(void *ctx, const char *_Nullable string,
+void *SwiftStringLiteralExpr_create(void *ctx, const uint8_t * _Nullable string,
                                     long len, void *TokenLoc);
 
-void *SwiftIntegerLiteralExpr_create(void *ctx, const char *_Nullable string,
+void *SwiftIntegerLiteralExpr_create(void *ctx, const uint8_t * _Nullable string,
                                     long len, void *TokenLoc);
 
 void *SwiftBooleanLiteralExpr_create(void *ctx, _Bool value, void *TokenLoc);
 
-void *SwiftVarDecl_create(void *ctx, const char *_Nullable name,
+void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable name,
                           void *loc, _Bool isStatic, _Bool isLet, void *dc);
 
 void *IfStmt_create(void *ctx, void *ifLoc, void *cond, void *_Nullable then, void *_Nullable elseLoc,
@@ -127,16 +131,16 @@ void *ParamDecl_create(void *ctx, void *loc,
                        void *declContext);
 
 void *FuncDecl_create(void *ctx, void *staticLoc, _Bool isStatic, void *funcLoc,
-                      const char *name, void *nameLoc,
+                      BridgedIdentifier name, void *nameLoc,
                       _Bool isAsync, void *_Nullable asyncLoc,
                       _Bool throws, void *_Nullable throwsLoc,
                       void *paramLLoc, BridgedArrayRef params, void *paramRLoc,
                       void *_Nullable body, void *_Nullable returnType,
                       void *declContext);
 
-void *SimpleIdentTypeRepr_create(void *ctx, void *loc, const char *id);
+void *SimpleIdentTypeRepr_create(void *ctx, void *loc, BridgedIdentifier id);
 
-void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, const char *name, void *nameLoc);
+void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, BridgedIdentifier name, void *nameLoc);
 
 void *ClosureExpr_create(void *ctx, void *body, void *dc);
 
@@ -148,10 +152,10 @@ struct DeclContextAndDecl {
   void *decl;
 };
 
-struct DeclContextAndDecl StructDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
-                        void *dc);
-struct DeclContextAndDecl ClassDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
-                       void *dc);
+struct DeclContextAndDecl StructDecl_create(
+    void *ctx, void *loc, BridgedIdentifier name, void *nameLoc, void *dc);
+struct DeclContextAndDecl ClassDecl_create(
+    void *ctx, void *loc, BridgedIdentifier name, void *nameLoc, void *dc);
 
 void TopLevelCodeDecl_dump(void *);
 void Expr_dump(void *);
diff --git a/lib/AST/CASTBridging.cpp b/lib/AST/CASTBridging.cpp
@@ -17,10 +17,12 @@ inline llvm::ArrayRef<T> getArrayRef(BridgedArrayRef bridged) {
 }
 
 BridgedIdentifier
-SwiftASTContext_getIdentifier(void *ctx, const char *_Nullable str, long len) {
-  return static_cast<ASTContext *>(ctx)
-      ->getIdentifier(StringRef{str, size_t(len)})
-      .get();
+SwiftASTContext_getIdentifier(void *ctx, const uint8_t *_Nullable str, long len) {
+  return const_cast<void *>(
+      static_cast<ASTContext *>(ctx)
+        ->getIdentifier(
+          StringRef{reinterpret_cast<const char *>(str), size_t(len)})
+        .getAsOpaquePointer());
 }
 
 void *SwiftImportDecl_create(void *ctx, void *dc, void *importLoc, char kind,
@@ -101,40 +103,43 @@ void *SwiftFunctionCallExpr_create(void *ctx, void *fn, void *args) {
                           /*implicit*/ false);
 }
 
-void *SwiftIdentifierExpr_create(void *ctx, const char *base, void *loc) {
+void *SwiftIdentifierExpr_create(void *ctx, BridgedIdentifier base, void *loc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   auto name = DeclNameRef{
-      swift::Identifier::getFromOpaquePointer(const_cast<char *>(base))};
+      swift::Identifier::getFromOpaquePointer(base)};
   Expr *E = new (Context) UnresolvedDeclRefExpr(
       name, DeclRefKind::Ordinary, DeclNameLoc{*(SourceLoc *)&loc});
   return E;
 }
 
-void *SwiftStringLiteralExpr_create(void *ctx, const char *_Nullable string,
-                                    long len, void *TokenLoc) {
+void *SwiftStringLiteralExpr_create(
+    void *ctx, const uint8_t *_Nullable string,
+    long len, void *TokenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) StringLiteralExpr(StringRef{string, size_t(len)},
-                                         *(SourceLoc *)&TokenLoc);
+  return new (Context) StringLiteralExpr(
+      StringRef{reinterpret_cast<const char *>(string), size_t(len)},
+      *(SourceLoc *)&TokenLoc);
 }
 
-void *SwiftIntegerLiteralExpr_create(void *ctx, const char *_Nullable string,
-                                long len, void *TokenLoc) {
+void *SwiftIntegerLiteralExpr_create(
+    void *ctx, const uint8_t *_Nullable string, long len, void *TokenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) IntegerLiteralExpr(StringRef{string, size_t(len)},
-                                         *(SourceLoc *)&TokenLoc);
+  return new (Context) IntegerLiteralExpr(
+      StringRef{reinterpret_cast<const char *>(string), size_t(len)},
+      *(SourceLoc *)&TokenLoc);
 }
 
 void *SwiftBooleanLiteralExpr_create(void *ctx, bool value, void *TokenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   return new (Context) BooleanLiteralExpr(value, *(SourceLoc *)&TokenLoc);
 }
 
-void *SwiftVarDecl_create(void *ctx, const char *_Nullable nameId,
+void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable nameId,
                           void *loc, bool isStatic, bool isLet, void *dc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   return new (Context) VarDecl(isStatic,
                                isLet ? VarDecl::Introducer::Let : VarDecl::Introducer::Var,
-                               *(SourceLoc *)&loc, Identifier::getFromOpaquePointer((void *)nameId),
+                               *(SourceLoc *)&loc, Identifier::getFromOpaquePointer(nameId),
                                reinterpret_cast<DeclContext *>(dc));
 }
 
@@ -164,10 +169,11 @@ void *BraceStmt_createStmt(void *ctx, void *lbloc, BridgedArrayRef elements, voi
                            *(SourceLoc *)&rbloc);
 }
 
-void *ParamDecl_create(void *ctx, void *loc,
-                       void *_Nullable argLoc, void *_Nullable argName,
-                       void *_Nullable paramLoc, void *_Nullable paramName,
-                       void *declContext) {
+void *ParamDecl_create(
+    void *ctx, void *loc,
+    void *_Nullable argLoc, BridgedIdentifier _Nullable argName,
+    void *_Nullable paramLoc, BridgedIdentifier _Nullable paramName,
+    void *declContext) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   return new (Context) ParamDecl(*(SourceLoc *)&loc, *(SourceLoc *)&argLoc,
                                  Identifier::getFromOpaquePointer(argName),
@@ -177,7 +183,7 @@ void *ParamDecl_create(void *ctx, void *loc,
 }
 
 void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
-                      const char *name, void *nameLoc,
+                      BridgedIdentifier name, void *nameLoc,
                       bool isAsync, void *_Nullable asyncLoc,
                       bool throws, void *_Nullable throwsLoc,
                       void *paramLLoc, BridgedArrayRef params, void *paramRLoc,
@@ -188,7 +194,7 @@ void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
       getArrayRef<ParamDecl *>(params), *(SourceLoc *)&paramRLoc);
   auto declName =
       DeclName(*static_cast<ASTContext *>(ctx),
-               Identifier::getFromOpaquePointer((void *)name), paramList);
+               Identifier::getFromOpaquePointer(name), paramList);
   auto *out = FuncDecl::create(
       *static_cast<ASTContext *>(ctx), *(SourceLoc *)&staticLoc,
       isStatic ? StaticSpellingKind::KeywordStatic : StaticSpellingKind::None,
@@ -200,16 +206,18 @@ void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,
   return static_cast<Decl *>(out);
 }
 
-void *SimpleIdentTypeRepr_create(void *ctx, void *loc, const char *id) {
+void *SimpleIdentTypeRepr_create(void *ctx, void *loc, BridgedIdentifier id) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   return new (Context) SimpleIdentTypeRepr(DeclNameLoc(*(SourceLoc *)&loc),
-                                           DeclNameRef(Identifier::getFromOpaquePointer((void *)id)));
+                                           DeclNameRef(Identifier::getFromOpaquePointer(id)));
 }
 
-void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, const char *name, void *nameLoc) {
+void *UnresolvedDotExpr_create(
+    void *ctx, void *base, void *dotLoc,  BridgedIdentifier name,
+    void *nameLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
       return new (Context) UnresolvedDotExpr((Expr *)base, *(SourceLoc *)&dotLoc,
-                                         DeclNameRef(Identifier::getFromOpaquePointer((void *)name)),
+                                         DeclNameRef(Identifier::getFromOpaquePointer(name)),
                                          DeclNameLoc(*(SourceLoc *)&nameLoc), false);
 }
 
@@ -235,23 +243,23 @@ void NominalTypeDecl_setMembers(void *decl, BridgedArrayRef members) {
     ((NominalTypeDecl *)decl)->addMember(m);
 }
 
-DeclContextAndDecl StructDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
-                        void *dc) {
+DeclContextAndDecl StructDecl_create(
+    void *ctx, void *loc, BridgedIdentifier name, void *nameLoc, void *dc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   auto *out = new (Context) StructDecl(SourceLoc(), // *(SourceLoc *)&loc,
-                                       Identifier::getFromOpaquePointer((void *)name),
+                                       Identifier::getFromOpaquePointer(name),
                                        SourceLoc(), // *(SourceLoc *)&nameLoc,
                                        {}, nullptr,
                                        (DeclContext *)dc);
   out->setImplicit(); // TODO: remove this.
   return {(DeclContext *)out, (NominalTypeDecl *)out, (Decl *)out};
 }
 
-DeclContextAndDecl ClassDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
-                       void *dc) {
+DeclContextAndDecl ClassDecl_create(
+    void *ctx, void *loc, BridgedIdentifier name, void *nameLoc, void *dc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
   auto *out = new (Context) ClassDecl(SourceLoc(), // *(SourceLoc *)&loc,
-                                      Identifier::getFromOpaquePointer((void *)name),
+                                      Identifier::getFromOpaquePointer(name),
                                       SourceLoc(), // *(SourceLoc *)&nameLoc,
                                       {}, nullptr,
                                       (DeclContext *)dc, false);
@@ -263,4 +271,4 @@ void TopLevelCodeDecl_dump(void *decl) { ((TopLevelCodeDecl *)decl)->dump(); }
 
 void Expr_dump(void *expr) { ((Expr *)expr)->dump(); }
 void Decl_dump(void *expr) { ((Decl *)expr)->dump(); }
-void Stmt_dump(void *expr) { ((Stmt *)expr)->dump(); }
+void Stmt_dump(void *expr) { ((Stmt *)expr)->dump(); }
diff --git a/lib/ASTGen/Sources/ASTGen/Decls.swift b/lib/ASTGen/Sources/ASTGen/Decls.swift
@@ -72,7 +72,7 @@ extension ASTGenVisitor {
     if let nodeFirstName = node.firstName {
       var text = nodeFirstName.text
       firstName = text.withUTF8 { buf in
-        SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count).raw
+        SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
       }
     } else {
       firstName = nil
@@ -81,7 +81,7 @@ extension ASTGenVisitor {
     if let nodeSecondName = node.secondName {
       var text = nodeSecondName.text
       secondName = text.withUTF8 { buf in
-        SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count).raw
+        SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
       }
     } else {
       secondName = nil
