Skip to content

Commit 69995e5

Browse files
committed
fix rebase fallout (CGDebugInfo.h removed from this header)
1 parent ae032c5 commit 69995e5

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

clang/lib/CodeGen/CodeGenFunction.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3326,3 +3326,15 @@ CodeGenFunction::EmitPointerAuthAuth(const CGPointerAuthInfo &PointerAuth,
33263326
return EmitPointerAuthCommon(*this, PointerAuth, Pointer,
33273327
llvm::Intrinsic::ptrauth_auth);
33283328
}
3329+
3330+
void CodeGenFunction::addInstToCurrentSourceAtom(
3331+
llvm::Instruction *KeyInstruction, llvm::Value *Backup) {
3332+
if (CGDebugInfo *DI = getDebugInfo())
3333+
DI->addInstToCurrentSourceAtom(KeyInstruction, Backup);
3334+
}
3335+
3336+
void CodeGenFunction::addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
3337+
llvm::Value *Backup) {
3338+
if (CGDebugInfo *DI = getDebugInfo())
3339+
DI->addRetToOverrideOrNewSourceAtom(Ret, Backup);
3340+
}

clang/lib/CodeGen/CodeGenFunction.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,17 +1742,11 @@ class CodeGenFunction : public CodeGenTypeCache {
17421742

17431743
/// See CGDebugInfo::addInstToCurrentSourceAtom.
17441744
void addInstToCurrentSourceAtom(llvm::Instruction *KeyInstruction,
1745-
llvm::Value *Backup) {
1746-
if (CGDebugInfo *DI = getDebugInfo())
1747-
DI->addInstToCurrentSourceAtom(KeyInstruction, Backup);
1748-
}
1745+
llvm::Value *Backup);
17491746

17501747
/// See CGDebugInfo::addRetToOverrideOrNewSourceAtom.
17511748
void addRetToOverrideOrNewSourceAtom(llvm::ReturnInst *Ret,
1752-
llvm::Value *Backup) {
1753-
if (CGDebugInfo *DI = getDebugInfo())
1754-
DI->addRetToOverrideOrNewSourceAtom(Ret, Backup);
1755-
}
1749+
llvm::Value *Backup);
17561750

17571751
private:
17581752
/// SwitchInsn - This is nearest current switch instruction. It is null if

0 commit comments

Comments
 (0)