3333#include " swift/AST/DiagnosticsModuleDiffer.h"
3434#include " swift/IDE/APIDigesterData.h"
3535#include < functional>
36- #include " ModuleAnalyzerNodes.h"
37- #include " ModuleDiagsConsumer.h"
36+ #include " swift/APIDigester/ ModuleAnalyzerNodes.h"
37+ #include " swift/APIDigester/ ModuleDiagsConsumer.h"
3838
3939using namespace swift ;
4040using namespace ide ;
@@ -2551,13 +2551,6 @@ static int generateMigrationScript(StringRef LeftPath, StringRef RightPath,
25512551 return 0 ;
25522552}
25532553
2554- // This function isn't referenced outside its translation unit, but it
2555- // can't use the "static" keyword because its address is used for
2556- // getMainExecutable (since some platforms don't support taking the
2557- // address of main, and some platforms can't implement getMainExecutable
2558- // without being given the address of a function in the main executable).
2559- void anchorForGetMainExecutable () {}
2560-
25612554static void setSDKPath (CompilerInvocation &InitInvok, bool IsBaseline) {
25622555 if (IsBaseline) {
25632556 // Set baseline SDK
@@ -2578,12 +2571,10 @@ static void setSDKPath(CompilerInvocation &InitInvok, bool IsBaseline) {
25782571 }
25792572}
25802573
2581- static int prepareForDump (const char *Main ,
2574+ static int prepareForDump (std::string MainExecutablePath ,
25822575 CompilerInvocation &InitInvok,
2583- llvm::StringSet<> &Modules,
2584- bool IsBaseline = false ) {
2585- InitInvok.setMainExecutablePath (fs::getMainExecutable (Main,
2586- reinterpret_cast <void *>(&anchorForGetMainExecutable)));
2576+ llvm::StringSet<> &Modules, bool IsBaseline = false ) {
2577+ InitInvok.setMainExecutablePath (MainExecutablePath);
25872578 InitInvok.setModuleName (" swift_ide_test"
25882579 setSDKPath (InitInvok, IsBaseline);
25892580
@@ -2692,7 +2683,7 @@ static int deserializeNameCorrection(APIDiffItemStore &Store,
26922683 return EC.value ();
26932684}
26942685
2695- static CheckerOptions getCheckOpts (int argc, char *argv[] ) {
2686+ static CheckerOptions getCheckOpts (ArrayRef< const char *> Args ) {
26962687 CheckerOptions Opts;
26972688 Opts.AvoidLocation = options::AvoidLocation;
26982689 Opts.AvoidToolArgs = options::AvoidToolArgs;
@@ -2708,8 +2699,8 @@ static CheckerOptions getCheckOpts(int argc, char *argv[]) {
27082699 Opts.SkipOSCheck = options::DisableOSChecks;
27092700 Opts.CompilerStyle = options::CompilerStyleDiags ||
27102701 !options::SerializedDiagPath.empty ();
2711- for (int i = 1 ; i < argc; ++i )
2712- Opts.ToolArgs .push_back (argv[i] );
2702+ for (auto Arg : Args )
2703+ Opts.ToolArgs .push_back (Arg );
27132704
27142705 if (!options::SDK.empty ()) {
27152706 auto Ver = getSDKBuildVersion (options::SDK);
@@ -2721,10 +2712,11 @@ static CheckerOptions getCheckOpts(int argc, char *argv[]) {
27212712 return Opts;
27222713}
27232714
2724- static SDKNodeRoot *getSDKRoot (const char *Main, SDKContext &Ctx, bool IsBaseline) {
2715+ static SDKNodeRoot *getSDKRoot (std::string MainExecutablePath, SDKContext &Ctx,
2716+ bool IsBaseline) {
27252717 CompilerInvocation Invok;
27262718 llvm::StringSet<> Modules;
2727- if (prepareForDump (Main , Invok, Modules, IsBaseline))
2719+ if (prepareForDump (MainExecutablePath , Invok, Modules, IsBaseline))
27282720 return nullptr ;
27292721 return getSDKNodeRoot (Ctx, Invok, Modules);
27302722}
@@ -2749,20 +2741,18 @@ static ComparisonInputMode checkComparisonInputMode() {
27492741 return ComparisonInputMode::BaselineJson;
27502742}
27512743
2752- static std::string getDefaultBaselineDir (const char *Main ) {
2744+ static std::string getDefaultBaselineDir (std::string MainExecutablePath ) {
27532745 llvm::SmallString<128 > BaselineDir;
2754- // The path of the swift-api-digester executable.
2755- std::string ExePath = llvm::sys::fs::getMainExecutable (Main,
2756- reinterpret_cast <void *>(&anchorForGetMainExecutable));
2757- BaselineDir.append (ExePath);
2746+ BaselineDir.append (MainExecutablePath);
27582747 llvm::sys::path::remove_filename (BaselineDir); // Remove /swift-api-digester
27592748 llvm::sys::path::remove_filename (BaselineDir); // Remove /bin
27602749 llvm::sys::path::append (BaselineDir, " lib" " swift" " FrameworkABIBaseline"
27612750 return BaselineDir.str ().str ();
27622751}
27632752
2764- static std::string getEmptyBaselinePath (const char *Main) {
2765- llvm::SmallString<128 > BaselinePath (getDefaultBaselineDir (Main));
2753+ static std::string getEmptyBaselinePath (std::string MainExecutablePath) {
2754+ llvm::SmallString<128 > BaselinePath (
2755+ getDefaultBaselineDir (MainExecutablePath));
27662756 llvm::sys::path::append (BaselinePath, " nil.json"
27672757 return BaselinePath.str ().str ();
27682758}
@@ -2788,10 +2778,11 @@ static StringRef getBaselineFilename(llvm::Triple Triple) {
27882778 }
27892779}
27902780
2791- static std::string getDefaultBaselinePath (const char *Main, StringRef Module ,
2792- llvm::Triple Triple,
2781+ static std::string getDefaultBaselinePath (std::string MainExecutablePath ,
2782+ StringRef Module, llvm::Triple Triple,
27932783 bool ABI) {
2794- llvm::SmallString<128 > BaselinePath (getDefaultBaselineDir (Main));
2784+ llvm::SmallString<128 > BaselinePath (
2785+ getDefaultBaselineDir (MainExecutablePath));
27952786 llvm::sys::path::append (BaselinePath, Module);
27962787 // Look for ABI or API baseline
27972788 llvm::sys::path::append (BaselinePath, ABI? " ABI" " API"
@@ -2807,12 +2798,13 @@ static std::string getCustomBaselinePath(llvm::Triple Triple, bool ABI) {
28072798 return BaselinePath.str ().str ();
28082799}
28092800
2810- static SDKNodeRoot *getBaselineFromJson (const char *Main, SDKContext &Ctx) {
2801+ static SDKNodeRoot *getBaselineFromJson (std::string MainExecutablePath,
2802+ SDKContext &Ctx) {
28112803 SwiftDeclCollector Collector (Ctx);
28122804 CompilerInvocation Invok;
28132805 llvm::StringSet<> Modules;
28142806 // We need to call prepareForDump to parse target triple.
2815- if (prepareForDump (Main , Invok, Modules, true ))
2807+ if (prepareForDump (MainExecutablePath , Invok, Modules, true ))
28162808 return nullptr ;
28172809
28182810 assert (Modules.size () == 1 &&
@@ -2825,9 +2817,9 @@ static SDKNodeRoot *getBaselineFromJson(const char *Main, SDKContext &Ctx) {
28252817 Path = getCustomBaselinePath (Invok.getLangOptions ().Target ,
28262818 Ctx.checkingABI ());
28272819 } else if (options::UseEmptyBaseline) {
2828- Path = getEmptyBaselinePath (Main );
2820+ Path = getEmptyBaselinePath (MainExecutablePath );
28292821 } else {
2830- Path = getDefaultBaselinePath (Main , Modules.begin ()->getKey (),
2822+ Path = getDefaultBaselinePath (MainExecutablePath , Modules.begin ()->getKey (),
28312823 Invok.getLangOptions ().Target ,
28322824 Ctx.checkingABI ());
28332825 }
@@ -2860,26 +2852,37 @@ static std::string getJsonOutputFilePath(llvm::Triple Triple, bool ABI) {
28602852 exit (1 );
28612853}
28622854
2863- int main ( int argc, char *argv[]) {
2864- PROGRAM_START (argc, argv);
2855+ int swift_api_digester_main (ArrayRef< const char *> Args, const char *Argv0,
2856+ void *MainAddr) {
28652857 INITIALIZE_LLVM ();
28662858
2859+ // LLVM Command Line parsing expects to trim off argv[0].
2860+ SmallVector<const char *, 8 > ArgsWithArgv0{Argv0};
2861+ ArgsWithArgv0.append (Args.begin (), Args.end ());
2862+
2863+ std::string MainExecutablePath = fs::getMainExecutable (Argv0, MainAddr);
2864+
28672865 llvm::cl::HideUnrelatedOptions (options::Category);
2868- llvm::cl::ParseCommandLineOptions (argc, argv, " Swift SDK Digester\n "
2866+ llvm::cl::ParseCommandLineOptions (ArgsWithArgv0.size (),
2867+ llvm::makeArrayRef (ArgsWithArgv0).data (),
2868+ " Swift SDK Digester\n "
28692869 CompilerInvocation InitInvok;
28702870
28712871 llvm::StringSet<> Modules;
28722872 std::vector<std::string> PrintApis;
28732873 llvm::StringSet<> IgnoredUsrs;
28742874 readIgnoredUsrs (IgnoredUsrs);
2875- CheckerOptions Opts = getCheckOpts (argc, argv );
2875+ CheckerOptions Opts = getCheckOpts (Args );
28762876 for (auto Name : options::ApisPrintUsrs)
28772877 PrintApis.push_back (Name);
28782878 switch (options::Action) {
28792879 case ActionType::DumpSDK:
2880- return (prepareForDump (argv[0 ], InitInvok, Modules)) ? 1 :
2881- dumpSDKContent (InitInvok, Modules,
2882- getJsonOutputFilePath (InitInvok.getLangOptions ().Target , Opts.ABI ),
2880+ return (prepareForDump (MainExecutablePath, InitInvok, Modules))
2881+ ? 1
2882+ : dumpSDKContent (
2883+ InitInvok, Modules,
2884+ getJsonOutputFilePath (InitInvok.getLangOptions ().Target ,
2885+ Opts.ABI ),
28832886 Opts);
28842887 case ActionType::MigratorGen:
28852888 case ActionType::DiagnoseSDKs: {
@@ -2904,17 +2907,17 @@ int main(int argc, char *argv[]) {
29042907 }
29052908 case ComparisonInputMode::BaselineJson: {
29062909 SDKContext Ctx (Opts);
2907- return diagnoseModuleChange (Ctx, getBaselineFromJson (argv[ 0 ], Ctx),
2908- getSDKRoot (argv[ 0 ] , Ctx, false ),
2909- options::OutputFile,
2910- std::move (protocolAllowlist));
2910+ return diagnoseModuleChange (
2911+ Ctx, getBaselineFromJson (MainExecutablePath , Ctx),
2912+ getSDKRoot (MainExecutablePath, Ctx, false ), options::OutputFile,
2913+ std::move (protocolAllowlist));
29112914 }
29122915 case ComparisonInputMode::BothLoad: {
29132916 SDKContext Ctx (Opts);
2914- return diagnoseModuleChange (Ctx, getSDKRoot (argv[ 0 ], Ctx, true ),
2915- getSDKRoot (argv[ 0 ] , Ctx, false ),
2916- options::OutputFile,
2917- std::move (protocolAllowlist));
2917+ return diagnoseModuleChange (
2918+ Ctx, getSDKRoot (MainExecutablePath , Ctx, true ),
2919+ getSDKRoot (MainExecutablePath, Ctx, false ), options::OutputFile,
2920+ std::move (protocolAllowlist));
29182921 }
29192922 }
29202923 }
0 commit comments