From 8123bfff545665ad0b44147c04c6f5296a0f610b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 2 Jun 2023 13:20:54 -0700 Subject: [PATCH] [Serialization] Fix serializing CompilerPluginExecutablePaths values rdar://110068048 --- lib/Frontend/Frontend.cpp | 2 +- lib/Serialization/Serialization.cpp | 2 +- test/Macros/serialize_plugin_search_paths.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp index 0769f2431d517..04ee3a6829342 100644 --- a/lib/Frontend/Frontend.cpp +++ b/lib/Frontend/Frontend.cpp @@ -225,7 +225,7 @@ SerializationOptions CompilerInvocation::computeSerializationOptions( llvm::interleave( pair.ModuleNames, [&](auto &name) { optStr += name; }, [&]() { optStr += ","; }); - serializationOpts.CompilerPluginLibraryPaths.push_back(optStr); + serializationOpts.CompilerPluginExecutablePaths.push_back(optStr); } serializationOpts.DisableCrossModuleIncrementalInfo = diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp index 0fc3125d71aa8..dddc065403f4c 100644 --- a/lib/Serialization/Serialization.cpp +++ b/lib/Serialization/Serialization.cpp @@ -1150,7 +1150,7 @@ void Serializer::writeHeader(const SerializationOptions &options) { options_block::CompilerPluginExecutablePathLayout CompilerPluginExecutablePath(Out); - for (auto Arg : options.CompilerPluginLibraryPaths) { + for (auto Arg : options.CompilerPluginExecutablePaths) { CompilerPluginExecutablePath.emit(ScratchRecord, Arg); } } diff --git a/test/Macros/serialize_plugin_search_paths.swift b/test/Macros/serialize_plugin_search_paths.swift index 76fff605f0d6a..95e901895e42d 100644 --- a/test/Macros/serialize_plugin_search_paths.swift +++ b/test/Macros/serialize_plugin_search_paths.swift @@ -15,7 +15,7 @@ // CHECK: -plugin-path: {{.*}}plugins // CHECK: -plugin-path: {{.*}}plugins // CHECK: -plugin-path: {{.*}}plugins +// CHECK: -plugin-path: {{.*}}plugins // CHECK: -external-plugin-path: {{.*}}plugins#{{.*}}swift-plugin-server // CHECK: -load-plugin-library: {{.*}}MacroDefinition.{{dylib|so|dll}} -// CHECK: -load-plugin-executable: {{.*}}MacroDefinition.{{dylib|so|dll}} // CHECK: -load-plugin-executable: {{.*}}mock-plugin#TestPlugin