Merge pull request #66370 from xymus/fix-serial-macros-5.9

[5.9][Serialization] Fix serializing CompilerPluginExecutablePaths values

Author: xymus

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 =

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);
         }
       }

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