[CHERI] Fix uses of deprecated withPointerElemTy() API

Also drop some unused DefaultAS variables that are no longer needed due to
upstream opaque pointer changes.

Author: arichardson

clang/lib/CodeGen/CGBuiltin.cpp

@@ -2389,7 +2389,6 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
       return RValue::get(llvm::ConstantFP::get(getLLVMContext(),
                                                Result.Val.getFloat()));
   }
-  unsigned DefaultAS = CGM.getTargetCodeGenInfo().getDefaultAS();
 
   // If current long-double semantics is IEEE 128-bit, replace math builtins
   // of long-double with f128 equivalent.

clang/lib/CodeGen/CGException.cpp

@@ -638,8 +638,9 @@ void CodeGenFunction::EnterCXXTryStmt(const CXXTryStmt &S, bool IsFnTryBlock) {
         TypeInfo.RTTI = CGM.getObjCRuntime().GetEHType(CaughtType);
         TypeInfo.RTTI = llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast(
             TypeInfo.RTTI,
-            llvm::PointerType::getWithSamePointeeType(
-                cast<llvm::PointerType>(TypeInfo.RTTI->getType()), 0));
+            llvm::PointerType::get(
+                cast<llvm::PointerType>(TypeInfo.RTTI->getType())->getContext(),
+                0));
       } else
         TypeInfo = CGM.getCXXABI().getAddrOfCXXCatchHandlerType(
             CaughtType, C->getCaughtType());

clang/lib/CodeGen/CGObjCGNU.cpp

@@ -2636,7 +2636,7 @@ CGObjCGNU::GenerateMessageSendSuper(CodeGenFunction &CGF,
   llvm::Value *imp = LookupIMPSuper(CGF, ObjCSuper, cmd, MSI);
   if (AS != 0)
     MSI.MessengerType =
-        llvm::PointerType::getWithSamePointeeType(MSI.MessengerType, AS);
+        llvm::PointerType::get(MSI.MessengerType->getContext(), AS);
   imp = EnforceType(Builder, imp, MSI.MessengerType);
 
   llvm::Metadata *impMD[] = {
@@ -2823,7 +2823,7 @@ CGObjCGNU::GenerateMessageSend(CodeGenFunction &CGF,
       // of the pointer, or we will end up deriving a DDC-relative capability,
       // which won't have the execute permission.
       MSI.MessengerType =
-          llvm::PointerType::getWithSamePointeeType(MSI.MessengerType, 0);
+          llvm::PointerType::get(MSI.MessengerType->getContext(), 0);
     }
 
   // Reset the receiver in case the lookup modified it
@@ -3882,7 +3882,7 @@ llvm::Function *CGObjCGNU::ModuleInitFunction() {
   llvm::Constant *module = [&] {
     llvm::Type *moduleEltTys[] = {
         LongTy, LongTy, PtrToInt8Ty,
-        llvm::PointerType::getWithSamePointeeType(symtabTy, AS), IntTy};
+        llvm::PointerType::get(symtabTy->getContext(), AS), IntTy};
     llvm::StructType *moduleTy =
       llvm::StructType::get(CGM.getLLVMContext(),
          ArrayRef(moduleEltTys).drop_back(unsigned(RuntimeVersion < 10)));
@@ -3935,8 +3935,8 @@ llvm::Function *CGObjCGNU::ModuleInitFunction() {
 
   llvm::PointerType *moduleTy = cast<llvm::PointerType>(module->getType());
   llvm::FunctionType *FT = llvm::FunctionType::get(
-      Builder.getVoidTy(),
-      llvm::PointerType::getWithSamePointeeType(moduleTy, AS), true);
+      Builder.getVoidTy(), llvm::PointerType::get(moduleTy->getContext(), AS),
+      true);
   llvm::FunctionCallee Register =
       CGM.CreateRuntimeFunction(FT, "__objc_exec_class");
   Builder.CreateCall(Register, module);

clang/lib/CodeGen/ItaniumCXXABI.cpp

@@ -1706,7 +1706,6 @@ ItaniumCXXABI::GetVirtualBaseClassOffset(CodeGenFunction &CGF, Address This,
         "vbase.offset.ptr");
 
   llvm::Value *VBaseOffset;
-  unsigned DefaultAS = CGM.getTargetCodeGenInfo().getDefaultAS();
   bool IsPurecap =
       CGF.getContext().getTargetInfo().areAllPointersCapabilities();
   if (CGM.getItaniumVTableContext().isRelativeLayout()) {
@@ -2247,7 +2246,6 @@ static llvm::Value *performTypeAdjustment(CodeGenFunction &CGF,
     llvm::Value *VTablePtr = CGF.Builder.CreateLoad(VTablePtrPtr);
 
     llvm::Value *Offset;
-    unsigned AS = CGF.CGM.getDataLayout().getGlobalsAddressSpace();
     llvm::Value *OffsetPtr = CGF.Builder.CreateConstInBoundsGEP1_64(
         CGF.Int8Ty, VTablePtr, VirtualAdjustment);
     if (CGF.CGM.getItaniumVTableContext().isRelativeLayout()) {

llvm/lib/CodeGen/CheriBoundAllocas.cpp

@@ -294,21 +294,6 @@ class CheriBoundAllocas : public ModulePass, public InstVisitor<CheriBoundAlloca
           // Instead of cloning the alloca, mutate it in-place to avoid missing
           // some important metadata (debug info/attributes/etc.).
           AI->setAllocatedType(TypeWithPadding);
-          if (!AI->getType()->isOpaquePointerTy()) {
-            // Explicitly create a bitcast instruction to allow us to RAUW all
-            // uses after changing the type (not needed with opaque pointers).
-            // We have to use a NULL source temporarily since we can only use
-            // AI after calling AI->mutateType(), and RAUW will assert if
-            // called after AI->mutateType(), so we need this temporary.
-            auto *NewPtr = new BitCastInst(
-                ConstantPointerNull::get(AllocaPtrTy), AllocaPtrTy,
-                "without-tail-padding", AI->getNextNonDebugInstruction());
-            AI->replaceAllUsesWith(NewPtr);
-            AI->mutateType(
-                TypeWithPadding->getPointerTo(AI->getAddressSpace()));
-            // Finally, set bitcast source to AI
-            NewPtr->getOperandUse(0).set(AI);
-          }
           Size = ConstantInt::get(
               SizeTy, AllocaSize + static_cast<uint64_t>(TailPadding));
         }