[clang] Preserve argument type in round pointer to alignment

JonChesterfield · JonChesterfield · commit 78eb2c2cba5a · 2024-04-18T22:44:26.000+01:00
diff --git a/clang/lib/CodeGen/ABIInfoImpl.cpp b/clang/lib/CodeGen/ABIInfoImpl.cpp
@@ -157,7 +157,7 @@ llvm::Value *CodeGen::emitRoundPointerUpToAlignment(CodeGenFunction &CGF,
   llvm::Value *RoundUp = CGF.Builder.CreateConstInBoundsGEP1_32(
       CGF.Builder.getInt8Ty(), Ptr, Align.getQuantity() - 1);
   return CGF.Builder.CreateIntrinsic(
-      llvm::Intrinsic::ptrmask, {CGF.AllocaInt8PtrTy, CGF.IntPtrTy},
+      llvm::Intrinsic::ptrmask, {Ptr->getType(), CGF.IntPtrTy},
       {RoundUp, llvm::ConstantInt::get(CGF.IntPtrTy, -Align.getQuantity())},
       nullptr, Ptr->getName() + ".aligned");
 }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ llvm::Value *CodeGen::emitRoundPointerUpToAlignment(CodeGenFunction &CGF,`
`157`	`157`	`llvm::Value *RoundUp = CGF.Builder.CreateConstInBoundsGEP1_32(`
`158`	`158`	`CGF.Builder.getInt8Ty(), Ptr, Align.getQuantity() - 1);`
`159`	`159`	`return CGF.Builder.CreateIntrinsic(`
`160`		`- llvm::Intrinsic::ptrmask, {CGF.AllocaInt8PtrTy, CGF.IntPtrTy},`
	`160`	`+ llvm::Intrinsic::ptrmask, {Ptr->getType(), CGF.IntPtrTy},`
`161`	`161`	`{RoundUp, llvm::ConstantInt::get(CGF.IntPtrTy, -Align.getQuantity())},`
`162`	`162`	`nullptr, Ptr->getName() + ".aligned");`
`163`	`163`	`}`