Skip to content

Commit 7314d38

Browse files
authored
[NFC][AutoUpgrade] Use ConstantPointerNull::get instead of Constant::getNullValue for known pointer types (#139984)
This is a preparation change for upcoming PRs that will update the semantics of `ConstantPointerNull`, making it to represent an actual `nullptr` rather than a zero-valued pointer.
1 parent 6ee30e8 commit 7314d38

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

llvm/lib/IR/AutoUpgrade.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,7 +1613,7 @@ GlobalVariable *llvm::UpgradeGlobalVariable(GlobalVariable *GV) {
16131613
auto Ctor = cast<Constant>(Init->getOperand(i));
16141614
NewCtors[i] = ConstantStruct::get(EltTy, Ctor->getAggregateElement(0u),
16151615
Ctor->getAggregateElement(1),
1616-
Constant::getNullValue(IRB.getPtrTy()));
1616+
ConstantPointerNull::get(IRB.getPtrTy()));
16171617
}
16181618
Constant *NewInit = ConstantArray::get(ArrayType::get(EltTy, N), NewCtors);
16191619

@@ -4721,10 +4721,10 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
47214721
}
47224722

47234723
// Create a new call with an added null annotation attribute argument.
4724-
NewCall =
4725-
Builder.CreateCall(NewFn, {CI->getArgOperand(0), CI->getArgOperand(1),
4726-
CI->getArgOperand(2), CI->getArgOperand(3),
4727-
Constant::getNullValue(Builder.getPtrTy())});
4724+
NewCall = Builder.CreateCall(
4725+
NewFn,
4726+
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(2),
4727+
CI->getArgOperand(3), ConstantPointerNull::get(Builder.getPtrTy())});
47284728
NewCall->takeName(CI);
47294729
CI->replaceAllUsesWith(NewCall);
47304730
CI->eraseFromParent();
@@ -4737,10 +4737,10 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
47374737
return;
47384738
}
47394739
// Create a new call with an added null annotation attribute argument.
4740-
NewCall =
4741-
Builder.CreateCall(NewFn, {CI->getArgOperand(0), CI->getArgOperand(1),
4742-
CI->getArgOperand(2), CI->getArgOperand(3),
4743-
Constant::getNullValue(Builder.getPtrTy())});
4740+
NewCall = Builder.CreateCall(
4741+
NewFn,
4742+
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(2),
4743+
CI->getArgOperand(3), ConstantPointerNull::get(Builder.getPtrTy())});
47444744
NewCall->takeName(CI);
47454745
CI->replaceAllUsesWith(NewCall);
47464746
CI->eraseFromParent();

0 commit comments

Comments
 (0)