Merge pull request #31401 from MForster/m/fix-master-next

Fix two compilation issues on master-next

Author: CodaFi

lib/AST/ModuleDependencies.cpp

@@ -39,7 +39,7 @@ ModuleDependencies::getAsClangModule() const {
 void ModuleDependencies::addModuleDependency(
     StringRef module, llvm::StringSet<> &alreadyAddedModules) {
   if (alreadyAddedModules.insert(module).second)
-    storage->moduleDependencies.push_back(module);
+    storage->moduleDependencies.push_back(module.str());
 }
 
 void ModuleDependencies::addModuleDependencies(
@@ -69,7 +69,7 @@ void ModuleDependencies::addModuleDependencies(
   }
 
   // Otherwise, record the source file.
-  swiftStorage->sourceFiles.push_back(fileName);
+  swiftStorage->sourceFiles.push_back(fileName.str());
 }
 
 Optional<std::string> ModuleDependencies::getBridgingHeader() const {
@@ -80,21 +80,21 @@ Optional<std::string> ModuleDependencies::getBridgingHeader() const {
 void ModuleDependencies::addBridgingHeader(StringRef bridgingHeader) {
   auto swiftStorage = cast<SwiftModuleDependenciesStorage>(storage.get());
   assert(!swiftStorage->bridgingHeaderFile);
-  swiftStorage->bridgingHeaderFile = bridgingHeader;
+  swiftStorage->bridgingHeaderFile = bridgingHeader.str();
 }
 
 /// Add source files that the bridging header depends on.
 void ModuleDependencies::addBridgingSourceFile(StringRef bridgingSourceFile) {
   auto swiftStorage = cast<SwiftModuleDependenciesStorage>(storage.get());
-  swiftStorage->bridgingSourceFiles.push_back(bridgingSourceFile);
+  swiftStorage->bridgingSourceFiles.push_back(bridgingSourceFile.str());
 }
 
 /// Add (Clang) module on which the bridging header depends.
 void ModuleDependencies::addBridgingModuleDependency(
     StringRef module, llvm::StringSet<> &alreadyAddedModules) {
   auto swiftStorage = cast<SwiftModuleDependenciesStorage>(storage.get());
   if (alreadyAddedModules.insert(module).second)
-    swiftStorage->bridgingModuleDependencies.push_back(module);
+    swiftStorage->bridgingModuleDependencies.push_back(module.str());
 }
 
 llvm::StringMap<ModuleDependencies> &
@@ -158,7 +158,7 @@ void ModuleDependenciesCache::recordDependencies(
   assert(map.count(moduleName) == 0 && "Already added to map");
   map.insert({moduleName, std::move(dependencies)});
 
-  AllModules.push_back({moduleName, kind});
+  AllModules.push_back({moduleName.str(), kind});
 }
 
 void ModuleDependenciesCache::updateDependencies(

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -134,7 +134,7 @@ static std::vector<std::string> getClangDepScanningInvocationArguments(
       commandLineArgs.begin(), commandLineArgs.end(),
       "<swift-imported-modules>");
   assert(sourceFilePos != commandLineArgs.end());
-  *sourceFilePos = sourceFileName;
+  *sourceFilePos = sourceFileName.str();
 
   // HACK! Drop the -fmodule-format= argument and the one that
   // precedes it.
@@ -202,7 +202,7 @@ static void recordModuleDependencies(
     // File dependencies for this module.
     std::vector<std::string> fileDeps;
     for (const auto &fileDep : clangModuleDep.FileDeps) {
-      fileDeps.push_back(fileDep.getKey());
+      fileDeps.push_back(fileDep.getKey().str());
     }
 
     // Module-level dependencies.
@@ -334,7 +334,7 @@ bool ClangImporter::addBridgingHeaderDependencies(
 
   // Update the cache with the new information for the module.
   cache.updateDependencies(
-     {moduleName, ModuleDependenciesKind::Swift},
+     {moduleName.str(), ModuleDependenciesKind::Swift},
      std::move(targetModule));
 
   return false;

lib/FrontendTool/ScanDependencies.cpp

@@ -46,7 +46,7 @@ static void findAllImportedClangModules(ASTContext &ctx, StringRef moduleName,
                                         llvm::StringSet<> &knownModules) {
   if (!knownModules.insert(moduleName).second)
     return;
-  allModules.push_back(moduleName);
+  allModules.push_back(moduleName.str());
 
   auto dependencies = cache.findDependencies(
       moduleName, ModuleDependenciesKind::Clang);
@@ -352,7 +352,7 @@ bool swift::scanDependencies(CompilerInstance &instance) {
 
   // Compute the dependencies of the main module.
   auto mainDependencies =
-      ModuleDependencies::forSwiftModule(mainModulePath.str());
+      ModuleDependencies::forSwiftModule(mainModulePath.str().str());
   {
     llvm::StringSet<> alreadyAddedModules;
     for (auto fileUnit : mainModule->getFiles()) {
@@ -410,7 +410,7 @@ bool swift::scanDependencies(CompilerInstance &instance) {
   llvm::SetVector<ModuleDependencyID, std::vector<ModuleDependencyID>,
                   std::set<ModuleDependencyID>> allModules;
 
-  allModules.insert({mainModuleName, mainDependencies.getKind()});
+  allModules.insert({mainModuleName.str(), mainDependencies.getKind()});
 
   // Create the module dependency cache.
   ModuleDependenciesCache cache;

lib/IRGen/GenCall.cpp

@@ -1615,7 +1615,7 @@ llvm::CallInst *CallEmission::emitCallSite() {
 
     // Insert a call to @llvm.coro.prepare.retcon, then bitcast to the right
     // function type.
-    auto origCallee = call->getCalledValue();
+    auto origCallee = call->getCalledOperand();
     llvm::Value *opaqueCallee = origCallee;
     opaqueCallee =
       IGF.Builder.CreateBitCast(opaqueCallee, IGF.IGM.Int8PtrTy);

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -1078,7 +1078,7 @@ bool SwiftMergeFunctions::replaceDirectCallers(Function *Old, Function *New,
       removeEquivalenceClassFromTree(FE);
 
     auto *CI = dyn_cast<CallInst>(I);
-    if (!CI || CI->getCalledValue() != Old) {
+    if (!CI || CI->getCalledOperand() != Old) {
       AllReplaced = false;
       continue;
     }

lib/Serialization/ModuleDependencyScanner.cpp

@@ -116,7 +116,7 @@ ErrorOr<ModuleDependencies> ModuleDependencyScanner::scanInterfaceFile(
   // Walk the source file to find the import declarations.
   llvm::StringSet<> alreadyAddedModules;
   auto dependencies = ModuleDependencies::forSwiftInterface(
-      modulePath.str(), moduleInterfacePath.str());
+      modulePath.str().str(), moduleInterfacePath.str());
 
   // FIXME: Suppressing diagnostics here is incorrect, and is currently
   // used to paper over the fact that we should be creating a fresh