[ASTGen] Use C briding instead of C++ method

Apparently C++ method bridging doesn't work in Linux?

Author: rintaro

include/swift/Parse/ParseBridging.h

@@ -35,19 +35,29 @@ class BridgedLegacyParser {
 
   swift::Parser &unbridged() const { return *handle; }
 #endif
-
-  BridgedASTContext getASTContext() const;
-  BridgedDiagnosticEngine getDiagnosticEngine() const;
-  BridgedStringRef getSourceBuffer() const;
-  BridgedDeclContext getCurrDeclContext() const;
-
-  BridgedExpr parseExpr(BridgedSourceLoc loc, BridgedDeclContext DC,
-                        bool isExprBasic) const;
-  BridgedDecl parseDecl(BridgedSourceLoc loc, BridgedDeclContext DC) const;
-  BridgedStmt parseStmt(BridgedSourceLoc loc, BridgedDeclContext DC) const;
-  BridgedTypeRepr parseType(BridgedSourceLoc loc, BridgedDeclContext DC) const;
 };
 
+SWIFT_NAME("BridgedLegacyParser.parseExpr(self:_:_:_:)")
+BridgedExpr BridgedLegacyParser_parseExpr(BridgedLegacyParser,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC,
+                                          bool isExprBasic);
+
+SWIFT_NAME("BridgedLegacyParser.parseDecl(self:_:_:)")
+BridgedDecl BridgedLegacyParser_parseDecl(BridgedLegacyParser,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC);
+
+SWIFT_NAME("BridgedLegacyParser.parseStmt(self:_:_:)")
+BridgedStmt BridgedLegacyParser_parseStmt(BridgedLegacyParser,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC);
+
+SWIFT_NAME("BridgedLegacyParser.parseType(self:_:_:)")
+BridgedTypeRepr BridgedLegacyParser_parseType(BridgedLegacyParser,
+                                              BridgedSourceLoc loc,
+                                              BridgedDeclContext DC);
+
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #endif // SWIFT_PARSE_PARSEBRIDGING_H

lib/Parse/ParseBridging.cpp

@@ -16,31 +16,13 @@
 
 using namespace swift;
 
-BridgedASTContext BridgedLegacyParser::getASTContext() const {
-  return unbridged().Context;
-}
-
-BridgedDiagnosticEngine BridgedLegacyParser::getDiagnosticEngine() const {
-  return &unbridged().Diags;
-}
-
-BridgedDeclContext BridgedLegacyParser::getCurrDeclContext() const {
-  return unbridged().CurDeclContext;
-}
-
-BridgedStringRef BridgedLegacyParser::getSourceBuffer() const {
-  // FIXME: Should we consider partial parsing?
-  StringRef text =
-      handle->SourceMgr.getEntireTextForBuffer(*handle->SF.getBufferID());
-  return {text.data(), text.size()};
-}
-
 // MARK: Functions called from SwiftParser.
 
-BridgedExpr BridgedLegacyParser::parseExpr(BridgedSourceLoc loc,
-                                           BridgedDeclContext DC,
-                                           bool isExprBasic) const {
-  auto &P = unbridged();
+BridgedExpr BridgedLegacyParser_parseExpr(BridgedLegacyParser p,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC,
+                                          bool isExprBasic) {
+  auto &P = p.unbridged();
   auto PP =
       P.getParserPosition(loc.unbridged(), /*PreviousLoc=*/loc.unbridged());
   P.CurDeclContext = DC.unbridged();
@@ -50,9 +32,10 @@ BridgedExpr BridgedLegacyParser::parseExpr(BridgedSourceLoc loc,
   return result.getPtrOrNull();
 }
 
-BridgedDecl BridgedLegacyParser::parseDecl(BridgedSourceLoc loc,
-                                           BridgedDeclContext DC) const {
-  auto &P = unbridged();
+BridgedDecl BridgedLegacyParser_parseDecl(BridgedLegacyParser p,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC) {
+  auto &P = p.unbridged();
   auto PP =
       P.getParserPosition(loc.unbridged(), /*PreviousLoc=*/loc.unbridged());
   P.CurDeclContext = DC.unbridged();
@@ -68,9 +51,10 @@ BridgedDecl BridgedLegacyParser::parseDecl(BridgedSourceLoc loc,
   return result.getPtrOrNull();
 }
 
-BridgedStmt BridgedLegacyParser::parseStmt(BridgedSourceLoc loc,
-                                           BridgedDeclContext DC) const {
-  auto &P = unbridged();
+BridgedStmt BridgedLegacyParser_parseStmt(BridgedLegacyParser p,
+                                          BridgedSourceLoc loc,
+                                          BridgedDeclContext DC) {
+  auto &P = p.unbridged();
   auto PP =
       P.getParserPosition(loc.unbridged(), /*PreviousLoc=*/loc.unbridged());
   P.CurDeclContext = DC.unbridged();
@@ -80,9 +64,10 @@ BridgedStmt BridgedLegacyParser::parseStmt(BridgedSourceLoc loc,
   return result.getPtrOrNull();
 }
 
-BridgedTypeRepr BridgedLegacyParser::parseType(BridgedSourceLoc loc,
-                                               BridgedDeclContext DC) const {
-  auto &P = unbridged();
+BridgedTypeRepr BridgedLegacyParser_parseType(BridgedLegacyParser p,
+                                              BridgedSourceLoc loc,
+                                              BridgedDeclContext DC) {
+  auto &P = p.unbridged();
   auto PP =
       P.getParserPosition(loc.unbridged(), /*PreviousLoc=*/loc.unbridged());
   P.CurDeclContext = DC.unbridged();