Skip to content

Commit 07d4680

Browse files
committed
[NFC][msan] Remove unused parameter from getOriginPtrForVAArgument (#72687)
1 parent 9bd5f80 commit 07d4680

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4667,13 +4667,6 @@ struct VarArgHelperBase : public VarArgHelper {
46674667
return IRB.CreateAdd(Base, ConstantInt::get(MS.IntptrTy, ArgOffset));
46684668
}
46694669

4670-
Value *getOriginPtrForVAArgument(IRBuilder<> &IRB, int ArgOffset) {
4671-
Value *Base = IRB.CreatePointerCast(MS.VAArgOriginTLS, MS.IntptrTy);
4672-
Base = IRB.CreateAdd(Base, ConstantInt::get(MS.IntptrTy, ArgOffset));
4673-
return IRB.CreateIntToPtr(Base, PointerType::get(MS.OriginTy, 0),
4674-
"_msarg_va_o");
4675-
}
4676-
46774670
/// Compute the shadow address for a given va_arg.
46784671
Value *getShadowPtrForVAArgument(Type *Ty, IRBuilder<> &IRB,
46794672
unsigned ArgOffset, unsigned ArgSize) {
@@ -4687,7 +4680,7 @@ struct VarArgHelperBase : public VarArgHelper {
46874680
}
46884681

46894682
/// Compute the origin address for a given va_arg.
4690-
Value *getOriginPtrForVAArgument(Type *Ty, IRBuilder<> &IRB, int ArgOffset) {
4683+
Value *getOriginPtrForVAArgument(IRBuilder<> &IRB, int ArgOffset) {
46914684
Value *Base = IRB.CreatePointerCast(MS.VAArgOriginTLS, MS.IntptrTy);
46924685
// getOriginPtrForVAArgument() is always called after
46934686
// getShadowPtrForVAArgument(), so __msan_va_arg_origin_tls can never
@@ -4793,7 +4786,7 @@ struct VarArgAMD64Helper : public VarArgHelperBase {
47934786
RealTy, IRB, OverflowOffset, alignTo(ArgSize, 8));
47944787
Value *OriginBase = nullptr;
47954788
if (MS.TrackOrigins)
4796-
OriginBase = getOriginPtrForVAArgument(RealTy, IRB, OverflowOffset);
4789+
OriginBase = getOriginPtrForVAArgument(IRB, OverflowOffset);
47974790
OverflowOffset += alignTo(ArgSize, 8);
47984791
if (!ShadowBase)
47994792
continue;
@@ -4819,14 +4812,14 @@ struct VarArgAMD64Helper : public VarArgHelperBase {
48194812
ShadowBase =
48204813
getShadowPtrForVAArgument(A->getType(), IRB, GpOffset, 8);
48214814
if (MS.TrackOrigins)
4822-
OriginBase = getOriginPtrForVAArgument(A->getType(), IRB, GpOffset);
4815+
OriginBase = getOriginPtrForVAArgument(IRB, GpOffset);
48234816
GpOffset += 8;
48244817
break;
48254818
case AK_FloatingPoint:
48264819
ShadowBase =
48274820
getShadowPtrForVAArgument(A->getType(), IRB, FpOffset, 16);
48284821
if (MS.TrackOrigins)
4829-
OriginBase = getOriginPtrForVAArgument(A->getType(), IRB, FpOffset);
4822+
OriginBase = getOriginPtrForVAArgument(IRB, FpOffset);
48304823
FpOffset += 16;
48314824
break;
48324825
case AK_Memory:
@@ -4836,8 +4829,7 @@ struct VarArgAMD64Helper : public VarArgHelperBase {
48364829
ShadowBase =
48374830
getShadowPtrForVAArgument(A->getType(), IRB, OverflowOffset, 8);
48384831
if (MS.TrackOrigins)
4839-
OriginBase =
4840-
getOriginPtrForVAArgument(A->getType(), IRB, OverflowOffset);
4832+
OriginBase = getOriginPtrForVAArgument(IRB, OverflowOffset);
48414833
OverflowOffset += alignTo(ArgSize, 8);
48424834
}
48434835
// Take fixed arguments into account for GpOffset and FpOffset,

0 commit comments

Comments
 (0)