Skip to content

Commit 3216bf1

Browse files
authored
CodeGen: Make TargetInstrInfo constructor protected (#157336)
1 parent 2654690 commit 3216bf1

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

llvm/include/llvm/CodeGen/TargetInstrInfo.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,14 @@ struct ExtAddrMode {
112112
/// TargetInstrInfo - Interface to description of machine instruction set
113113
///
114114
class LLVM_ABI TargetInstrInfo : public MCInstrInfo {
115-
public:
115+
protected:
116116
TargetInstrInfo(unsigned CFSetupOpcode = ~0u, unsigned CFDestroyOpcode = ~0u,
117117
unsigned CatchRetOpcode = ~0u, unsigned ReturnOpcode = ~0u)
118118
: CallFrameSetupOpcode(CFSetupOpcode),
119119
CallFrameDestroyOpcode(CFDestroyOpcode), CatchRetOpcode(CatchRetOpcode),
120120
ReturnOpcode(ReturnOpcode) {}
121+
122+
public:
121123
TargetInstrInfo(const TargetInstrInfo &) = delete;
122124
TargetInstrInfo &operator=(const TargetInstrInfo &) = delete;
123125
virtual ~TargetInstrInfo();

llvm/unittests/CodeGen/MFCommon.inc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ public:
7575
}
7676
};
7777

78+
class BogusTargetInstrInfo : public TargetInstrInfo {
79+
public:
80+
BogusTargetInstrInfo() : TargetInstrInfo() {}
81+
};
82+
7883
class BogusSubtarget : public TargetSubtargetInfo {
7984
public:
8085
BogusSubtarget(TargetMachine &TM)
@@ -95,7 +100,7 @@ private:
95100
BogusFrameLowering FL;
96101
BogusRegisterInfo TRI;
97102
BogusTargetLowering TL;
98-
TargetInstrInfo TII;
103+
BogusTargetInstrInfo TII;
99104
};
100105

101106
static TargetOptions getTargetOptionsForBogusMachine() {

0 commit comments

Comments
 (0)