IRGen: Address llvm::PointerType::get(Unqual) deprecations

See llvm/llvm-project#134517.

Author: AnthonyLatsis

lib/IRGen/GenBuiltin.cpp

@@ -730,8 +730,7 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
       newval = IGF.Builder.CreatePtrToInt(newval, IGF.IGM.IntPtrTy);
     }
 
-    pointer = IGF.Builder.CreateBitCast(pointer,
-                                  llvm::PointerType::getUnqual(cmp->getType()));
+    pointer = IGF.Builder.CreateBitCast(pointer, IGM.PtrTy);
     llvm::Value *value = IGF.Builder.CreateAtomicCmpXchg(
         pointer, cmp, newval, llvm::MaybeAlign(),
         successOrdering, failureOrdering,
@@ -799,8 +798,7 @@ void irgen::emitBuiltinCall(IRGenFunction &IGF, const BuiltinInfo &Builtin,
     if (origTy->isPointerTy())
       val = IGF.Builder.CreatePtrToInt(val, IGF.IGM.IntPtrTy);
 
-    pointer = IGF.Builder.CreateBitCast(pointer,
-                                  llvm::PointerType::getUnqual(val->getType()));
+    pointer = IGF.Builder.CreateBitCast(pointer, IGM.PtrTy);
     llvm::Value *value = IGF.Builder.CreateAtomicRMW(
         SubOpcode, pointer, val, llvm::MaybeAlign(), ordering,
         isSingleThread ? llvm::SyncScope::SingleThread

lib/LLVMPasses/LLVMMergeFunctions.cpp

@@ -1322,8 +1322,9 @@ bool SwiftMergeFunctions::replaceDirectCallers(Function *Old, Function *New,
 
     auto *FType = FunctionType::get(Old->getFunctionType()->getReturnType(),
                                     OldParamTypes, false);
-    auto *FPtrType = PointerType::get(FType,
-                        cast<PointerType>(New->getType())->getAddressSpace());
+    auto *FPtrType =
+        PointerType::get(module->getContext(),
+                         cast<PointerType>(New->getType())->getAddressSpace());
 
     Value *Callee = ConstantExpr::getBitCast(New, FPtrType);
     CallInst *NewCI = Builder.CreateCall(FType, Callee, NewArgs);