Skip to content

Commit 3b085b1

Browse files
PiJoulesHoney Goyal
authored andcommitted
[NFC][clang] Remove extra To in method name (llvm#170723)
`hasPointeeToToCFIUncheckedCalleeFunctionType` -> `hasPointeeToCFIUncheckedCalleeFunctionType`
1 parent dba20d3 commit 3b085b1

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

clang/include/clang/AST/TypeBase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2607,7 +2607,7 @@ class alignas(TypeAlignment) Type : public ExtQualsTypeCommonBase {
26072607
bool isAnyPointerType() const; // Any C pointer or ObjC object pointer
26082608
bool isCountAttributedType() const;
26092609
bool isCFIUncheckedCalleeFunctionType() const;
2610-
bool hasPointeeToToCFIUncheckedCalleeFunctionType() const;
2610+
bool hasPointeeToCFIUncheckedCalleeFunctionType() const;
26112611
bool isBlockPointerType() const;
26122612
bool isVoidPointerType() const;
26132613
bool isReferenceType() const;
@@ -8564,7 +8564,7 @@ inline bool Type::isCFIUncheckedCalleeFunctionType() const {
85648564
return false;
85658565
}
85668566

8567-
inline bool Type::hasPointeeToToCFIUncheckedCalleeFunctionType() const {
8567+
inline bool Type::hasPointeeToCFIUncheckedCalleeFunctionType() const {
85688568
QualType Pointee;
85698569
if (const auto *PT = getAs<PointerType>())
85708570
Pointee = PT->getPointeeType();

clang/lib/CodeGen/CGExpr.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6601,8 +6601,7 @@ RValue CodeGenFunction::EmitCall(QualType CalleeType,
66016601
FD && DeviceKernelAttr::isOpenCLSpelling(FD->getAttr<DeviceKernelAttr>()))
66026602
CGM.getTargetCodeGenInfo().setOCLKernelStubCallingConvention(FnType);
66036603

6604-
bool CFIUnchecked =
6605-
CalleeType->hasPointeeToToCFIUncheckedCalleeFunctionType();
6604+
bool CFIUnchecked = CalleeType->hasPointeeToCFIUncheckedCalleeFunctionType();
66066605

66076606
// If we are checking indirect calls and this call is indirect, check that the
66086607
// function pointer is a member of the bit set for the function type.

clang/lib/CodeGen/CGPointerAuth.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ llvm::Constant *CodeGenModule::getMemberFunctionPointer(llvm::Constant *Pointer,
530530
cast_or_null<llvm::ConstantInt>(PointerAuth.getDiscriminator()));
531531

532532
if (const auto *MFT = dyn_cast<MemberPointerType>(FT.getTypePtr())) {
533-
if (MFT->hasPointeeToToCFIUncheckedCalleeFunctionType())
533+
if (MFT->hasPointeeToCFIUncheckedCalleeFunctionType())
534534
Pointer = llvm::NoCFIValue::get(cast<llvm::GlobalValue>(Pointer));
535535
}
536536

clang/lib/CodeGen/ItaniumCXXABI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ CGCallee ItaniumCXXABI::EmitLoadOfMemberFunctionPointer(
709709
if (BinOp->isPtrMemOp() &&
710710
BinOp->getRHS()
711711
->getType()
712-
->hasPointeeToToCFIUncheckedCalleeFunctionType())
712+
->hasPointeeToCFIUncheckedCalleeFunctionType())
713713
ShouldEmitCFICheck = false;
714714
}
715715
}

0 commit comments

Comments
 (0)