Merge pull request #31089 from MForster/fix-build-master

Fix master-next build (Part 1)

Author: gribozavr

include/swift/Reflection/TypeRef.h

@@ -352,7 +352,7 @@ class OpaqueArchetypeTypeRef final : public TypeRef {
                            StringRef description, unsigned ordinal,
                            ArrayRef<ArrayRef<const TypeRef *>> argumentLists) {
     TypeRefID ID;
-    ID.addString(idString);
+    ID.addString(idString.str());
     ID.addInteger(ordinal);
     for (auto argList : argumentLists) {
       ID.addInteger(0u);

lib/IRGen/GenCall.cpp

@@ -1660,8 +1660,10 @@ llvm::CallInst *IRBuilder::CreateCall(const FunctionPointer &fn,
   }
 
   assert(!isTrapIntrinsic(fn.getPointer()) && "Use CreateNonMergeableTrap");
-  llvm::CallInst *call =
-    IRBuilderBase::CreateCall(fn.getPointer(), args, bundles);
+  llvm::CallInst *call = IRBuilderBase::CreateCall(
+      cast<llvm::FunctionType>(
+          fn.getPointer()->getType()->getPointerElementType()),
+      fn.getPointer(), args, bundles);
   call->setAttributes(fn.getAttributes());
   call->setCallingConv(fn.getCallingConv());
   return call;

lib/IRGen/GenDecl.cpp

@@ -1729,7 +1729,9 @@ void IRGenModule::emitVTableStubs() {
       stub->setCallingConv(DefaultCC);
       auto *entry = llvm::BasicBlock::Create(getLLVMContext(), "entry", stub);
       auto *errorFunc = getDeletedMethodErrorFn();
-      llvm::CallInst::Create(errorFunc, ArrayRef<llvm::Value *>(), "", entry);
+      llvm::CallInst::Create(cast<llvm::FunctionType>(
+                                 errorFunc->getType()->getPointerElementType()),
+                             errorFunc, ArrayRef<llvm::Value *>(), "", entry);
       new llvm::UnreachableInst(getLLVMContext(), entry);
     }
 

lib/IRGen/IRBuilder.h

@@ -271,7 +271,9 @@ class IRBuilder : public IRBuilderBase {
     // assert((!DebugInfo || getCurrentDebugLocation()) && "no debugloc on
     // call");
     assert(!isTrapIntrinsic(Callee) && "Use CreateNonMergeableTrap");
-    auto Call = IRBuilderBase::CreateCall(Callee, Args, Name, FPMathTag);
+    auto Call = IRBuilderBase::CreateCall(
+        cast<llvm::FunctionType>(Callee->getType()->getPointerElementType()),
+        Callee, Args, Name, FPMathTag);
     setCallingConvUsingCallee(Call);
     return Call;
   }

lib/LLVMPasses/ARCEntryPointBuilder.h

@@ -72,14 +72,18 @@ class ARCEntryPointBuilder {
   llvm::CallingConv::ID DefaultCC;
 
   llvm::CallInst *CreateCall(Constant *Fn, Value *V) {
-    CallInst *CI = B.CreateCall(Fn, V);
+    CallInst *CI = B.CreateCall(
+        cast<llvm::FunctionType>(Fn->getType()->getPointerElementType()), Fn,
+        V);
     if (auto Fun = llvm::dyn_cast<llvm::Function>(Fn))
       CI->setCallingConv(Fun->getCallingConv());
     return CI;
   }
 
   llvm::CallInst *CreateCall(Constant *Fn, llvm::ArrayRef<Value *> Args) {
-    CallInst *CI = B.CreateCall(Fn, Args);
+    CallInst *CI = B.CreateCall(
+        cast<llvm::FunctionType>(Fn->getType()->getPointerElementType()), Fn,
+        Args);
     if (auto Fun = llvm::dyn_cast<llvm::Function>(Fn))
       CI->setCallingConv(Fun->getCallingConv());
     return CI;

stdlib/public/Reflection/TypeRef.cpp

@@ -258,8 +258,8 @@ class PrintTypeRef : public TypeRefVisitor<PrintTypeRef, void> {
 
   void visitOpaqueArchetypeTypeRef(const OpaqueArchetypeTypeRef *O) {
     printHeader("opaque_archetype");
-    printField("id", O->getID());
-    printField("description", O->getDescription());
+    printField("id", O->getID().str());
+    printField("description", O->getDescription().str());
     fprintf(file, " ordinal %u ", O->getOrdinal());
     for (auto argList : O->getArgumentLists()) {
       fprintf(file, "\n");