Subzero: Remove LLVM_DELETED_FUNCTION.
sed -i 's/LLVM_DELETED_FUNCTION/= delete/' src/*.{h,cpp}
BUG= https://codereview.chromium.org/512933006/
R=jfb@chromium.org
Review URL: https://codereview.chromium.org/619983002
diff --git a/src/IceCfg.h b/src/IceCfg.h
index 5a4c4a1..4766d47 100644
--- a/src/IceCfg.h
+++ b/src/IceCfg.h
@@ -184,8 +184,8 @@
// spurious validation failures.
const CfgNode *CurrentNode;
- Cfg(const Cfg &) LLVM_DELETED_FUNCTION;
- Cfg &operator=(const Cfg &) LLVM_DELETED_FUNCTION;
+ Cfg(const Cfg &) = delete;
+ Cfg &operator=(const Cfg &) = delete;
};
} // end of namespace Ice
diff --git a/src/IceCfgNode.h b/src/IceCfgNode.h
index eba98c0..cc97ae4 100644
--- a/src/IceCfgNode.h
+++ b/src/IceCfgNode.h
@@ -71,8 +71,8 @@
private:
CfgNode(Cfg *Func, SizeT LabelIndex, IceString Name);
- CfgNode(const CfgNode &) LLVM_DELETED_FUNCTION;
- CfgNode &operator=(const CfgNode &) LLVM_DELETED_FUNCTION;
+ CfgNode(const CfgNode &) = delete;
+ CfgNode &operator=(const CfgNode &) = delete;
Cfg *const Func;
const SizeT Number; // label index
IceString Name; // for dumping only
diff --git a/src/IceConverter.h b/src/IceConverter.h
index 8903607..049c036 100644
--- a/src/IceConverter.h
+++ b/src/IceConverter.h
@@ -34,8 +34,8 @@
llvm::Module *Mod;
// Converts functions to ICE, and then machine code.
void convertFunctions();
- Converter(const Converter &) LLVM_DELETED_FUNCTION;
- Converter &operator=(const Converter &) LLVM_DELETED_FUNCTION;
+ Converter(const Converter &) = delete;
+ Converter &operator=(const Converter &) = delete;
};
}
diff --git a/src/IceGlobalContext.cpp b/src/IceGlobalContext.cpp
index c2262ad..7ea7e5d 100644
--- a/src/IceGlobalContext.cpp
+++ b/src/IceGlobalContext.cpp
@@ -35,8 +35,8 @@
// KeyTypeHasFP with C++11.
template <typename KeyType, typename ValueType, bool KeyTypeHasFP = false>
class TypePool {
- TypePool(const TypePool &) LLVM_DELETED_FUNCTION;
- TypePool &operator=(const TypePool &) LLVM_DELETED_FUNCTION;
+ TypePool(const TypePool &) = delete;
+ TypePool &operator=(const TypePool &) = delete;
public:
TypePool() : NextPoolID(0) {}
@@ -75,8 +75,8 @@
// UndefPool maps ICE types to the corresponding ConstantUndef values.
class UndefPool {
- UndefPool(const UndefPool &) LLVM_DELETED_FUNCTION;
- UndefPool &operator=(const UndefPool &) LLVM_DELETED_FUNCTION;
+ UndefPool(const UndefPool &) = delete;
+ UndefPool &operator=(const UndefPool &) = delete;
public:
UndefPool() : NextPoolID(0) {}
@@ -99,8 +99,8 @@
// The global constant pool bundles individual pools of each type of
// interest.
class ConstantPool {
- ConstantPool(const ConstantPool &) LLVM_DELETED_FUNCTION;
- ConstantPool &operator=(const ConstantPool &) LLVM_DELETED_FUNCTION;
+ ConstantPool(const ConstantPool &) = delete;
+ ConstantPool &operator=(const ConstantPool &) = delete;
public:
ConstantPool() {}
diff --git a/src/IceGlobalContext.h b/src/IceGlobalContext.h
index 8dca08f..0ffff1c 100644
--- a/src/IceGlobalContext.h
+++ b/src/IceGlobalContext.h
@@ -173,8 +173,8 @@
CodeStats StatsFunction;
CodeStats StatsCumulative;
std::unique_ptr<class TimerStack> Timers;
- GlobalContext(const GlobalContext &) LLVM_DELETED_FUNCTION;
- GlobalContext &operator=(const GlobalContext &) LLVM_DELETED_FUNCTION;
+ GlobalContext(const GlobalContext &) = delete;
+ GlobalContext &operator=(const GlobalContext &) = delete;
// Private helpers for mangleName()
typedef llvm::SmallVector<char, 32> ManglerVector;
@@ -185,8 +185,8 @@
// pushes a marker, and the destructor pops it. This is for
// convenient timing of regions of code.
class TimerMarker {
- TimerMarker(const TimerMarker &) LLVM_DELETED_FUNCTION;
- TimerMarker &operator=(const TimerMarker &) LLVM_DELETED_FUNCTION;
+ TimerMarker(const TimerMarker &) = delete;
+ TimerMarker &operator=(const TimerMarker &) = delete;
public:
TimerMarker(TimerIdT ID, GlobalContext *Ctx)
diff --git a/src/IceInst.h b/src/IceInst.h
index 3727e6e..d1e26fb 100644
--- a/src/IceInst.h
+++ b/src/IceInst.h
@@ -165,13 +165,13 @@
LREndedBits LiveRangesEnded;
private:
- Inst(const Inst &) LLVM_DELETED_FUNCTION;
- Inst &operator=(const Inst &) LLVM_DELETED_FUNCTION;
+ Inst(const Inst &) = delete;
+ Inst &operator=(const Inst &) = delete;
};
class InstHighLevel : public Inst {
- InstHighLevel(const InstHighLevel &) LLVM_DELETED_FUNCTION;
- InstHighLevel &operator=(const InstHighLevel &) LLVM_DELETED_FUNCTION;
+ InstHighLevel(const InstHighLevel &) = delete;
+ InstHighLevel &operator=(const InstHighLevel &) = delete;
protected:
InstHighLevel(Cfg *Func, InstKind Kind, SizeT MaxSrcs, Variable *Dest)
@@ -203,8 +203,8 @@
private:
InstAlloca(Cfg *Func, Operand *ByteCount, uint32_t AlignInBytes,
Variable *Dest);
- InstAlloca(const InstAlloca &) LLVM_DELETED_FUNCTION;
- InstAlloca &operator=(const InstAlloca &) LLVM_DELETED_FUNCTION;
+ InstAlloca(const InstAlloca &) = delete;
+ InstAlloca &operator=(const InstAlloca &) = delete;
~InstAlloca() override {}
const uint32_t AlignInBytes;
};
@@ -236,8 +236,8 @@
private:
InstArithmetic(Cfg *Func, OpKind Op, Variable *Dest, Operand *Source1,
Operand *Source2);
- InstArithmetic(const InstArithmetic &) LLVM_DELETED_FUNCTION;
- InstArithmetic &operator=(const InstArithmetic &) LLVM_DELETED_FUNCTION;
+ InstArithmetic(const InstArithmetic &) = delete;
+ InstArithmetic &operator=(const InstArithmetic &) = delete;
~InstArithmetic() override {}
const OpKind Op;
@@ -261,8 +261,8 @@
private:
InstAssign(Cfg *Func, Variable *Dest, Operand *Source);
- InstAssign(const InstAssign &) LLVM_DELETED_FUNCTION;
- InstAssign &operator=(const InstAssign &) LLVM_DELETED_FUNCTION;
+ InstAssign(const InstAssign &) = delete;
+ InstAssign &operator=(const InstAssign &) = delete;
~InstAssign() override {}
};
@@ -301,8 +301,8 @@
InstBr(Cfg *Func, Operand *Source, CfgNode *TargetTrue, CfgNode *TargetFalse);
// Unconditional branch
InstBr(Cfg *Func, CfgNode *Target);
- InstBr(const InstBr &) LLVM_DELETED_FUNCTION;
- InstBr &operator=(const InstBr &) LLVM_DELETED_FUNCTION;
+ InstBr(const InstBr &) = delete;
+ InstBr &operator=(const InstBr &) = delete;
~InstBr() override {}
CfgNode *const TargetFalse; // Doubles as unconditional branch target
@@ -343,8 +343,8 @@
private:
bool HasTailCall;
- InstCall(const InstCall &) LLVM_DELETED_FUNCTION;
- InstCall &operator=(const InstCall &) LLVM_DELETED_FUNCTION;
+ InstCall(const InstCall &) = delete;
+ InstCall &operator=(const InstCall &) = delete;
};
// Cast instruction (a.k.a. conversion operation).
@@ -368,8 +368,8 @@
private:
InstCast(Cfg *Func, OpKind CastKind, Variable *Dest, Operand *Source);
- InstCast(const InstCast &) LLVM_DELETED_FUNCTION;
- InstCast &operator=(const InstCast &) LLVM_DELETED_FUNCTION;
+ InstCast(const InstCast &) = delete;
+ InstCast &operator=(const InstCast &) = delete;
~InstCast() override {}
const OpKind CastKind;
};
@@ -391,9 +391,8 @@
private:
InstExtractElement(Cfg *Func, Variable *Dest, Operand *Source1,
Operand *Source2);
- InstExtractElement(const InstExtractElement &) LLVM_DELETED_FUNCTION;
- InstExtractElement &
- operator=(const InstExtractElement &) LLVM_DELETED_FUNCTION;
+ InstExtractElement(const InstExtractElement &) = delete;
+ InstExtractElement &operator=(const InstExtractElement &) = delete;
~InstExtractElement() override {}
};
@@ -420,8 +419,8 @@
private:
InstFcmp(Cfg *Func, FCond Condition, Variable *Dest, Operand *Source1,
Operand *Source2);
- InstFcmp(const InstFcmp &) LLVM_DELETED_FUNCTION;
- InstFcmp &operator=(const InstFcmp &) LLVM_DELETED_FUNCTION;
+ InstFcmp(const InstFcmp &) = delete;
+ InstFcmp &operator=(const InstFcmp &) = delete;
~InstFcmp() override {}
const FCond Condition;
};
@@ -449,8 +448,8 @@
private:
InstIcmp(Cfg *Func, ICond Condition, Variable *Dest, Operand *Source1,
Operand *Source2);
- InstIcmp(const InstIcmp &) LLVM_DELETED_FUNCTION;
- InstIcmp &operator=(const InstIcmp &) LLVM_DELETED_FUNCTION;
+ InstIcmp(const InstIcmp &) = delete;
+ InstIcmp &operator=(const InstIcmp &) = delete;
~InstIcmp() override {}
const ICond Condition;
};
@@ -472,8 +471,8 @@
private:
InstInsertElement(Cfg *Func, Variable *Dest, Operand *Source1,
Operand *Source2, Operand *Source3);
- InstInsertElement(const InstInsertElement &) LLVM_DELETED_FUNCTION;
- InstInsertElement &operator=(const InstInsertElement &) LLVM_DELETED_FUNCTION;
+ InstInsertElement(const InstInsertElement &) = delete;
+ InstInsertElement &operator=(const InstInsertElement &) = delete;
~InstInsertElement() override {}
};
@@ -499,8 +498,8 @@
: InstCall(Func, NumArgs, Dest, CallTarget, false, Info.HasSideEffects,
Inst::IntrinsicCall),
Info(Info) {}
- InstIntrinsicCall(const InstIntrinsicCall &) LLVM_DELETED_FUNCTION;
- InstIntrinsicCall &operator=(const InstIntrinsicCall &) LLVM_DELETED_FUNCTION;
+ InstIntrinsicCall(const InstIntrinsicCall &) = delete;
+ InstIntrinsicCall &operator=(const InstIntrinsicCall &) = delete;
~InstIntrinsicCall() override {}
const Intrinsics::IntrinsicInfo Info;
};
@@ -521,8 +520,8 @@
private:
InstLoad(Cfg *Func, Variable *Dest, Operand *SourceAddr);
- InstLoad(const InstLoad &) LLVM_DELETED_FUNCTION;
- InstLoad &operator=(const InstLoad &) LLVM_DELETED_FUNCTION;
+ InstLoad(const InstLoad &) = delete;
+ InstLoad &operator=(const InstLoad &) = delete;
~InstLoad() override {}
};
@@ -543,8 +542,8 @@
private:
InstPhi(Cfg *Func, SizeT MaxSrcs, Variable *Dest);
- InstPhi(const InstPhi &) LLVM_DELETED_FUNCTION;
- InstPhi &operator=(const InstPhi &) LLVM_DELETED_FUNCTION;
+ InstPhi(const InstPhi &) = delete;
+ InstPhi &operator=(const InstPhi &) = delete;
void destroy(Cfg *Func) override {
Func->deallocateArrayOf<CfgNode *>(Labels);
Inst::destroy(Func);
@@ -576,8 +575,8 @@
private:
InstRet(Cfg *Func, Operand *RetValue);
- InstRet(const InstRet &) LLVM_DELETED_FUNCTION;
- InstRet &operator=(const InstRet &) LLVM_DELETED_FUNCTION;
+ InstRet(const InstRet &) = delete;
+ InstRet &operator=(const InstRet &) = delete;
~InstRet() override {}
};
@@ -598,8 +597,8 @@
private:
InstSelect(Cfg *Func, Variable *Dest, Operand *Condition, Operand *Source1,
Operand *Source2);
- InstSelect(const InstSelect &) LLVM_DELETED_FUNCTION;
- InstSelect &operator=(const InstSelect &) LLVM_DELETED_FUNCTION;
+ InstSelect(const InstSelect &) = delete;
+ InstSelect &operator=(const InstSelect &) = delete;
~InstSelect() override {}
};
@@ -620,8 +619,8 @@
private:
InstStore(Cfg *Func, Operand *Data, Operand *Addr);
- InstStore(const InstStore &) LLVM_DELETED_FUNCTION;
- InstStore &operator=(const InstStore &) LLVM_DELETED_FUNCTION;
+ InstStore(const InstStore &) = delete;
+ InstStore &operator=(const InstStore &) = delete;
~InstStore() override {}
};
@@ -652,8 +651,8 @@
private:
InstSwitch(Cfg *Func, SizeT NumCases, Operand *Source, CfgNode *LabelDefault);
- InstSwitch(const InstSwitch &) LLVM_DELETED_FUNCTION;
- InstSwitch &operator=(const InstSwitch &) LLVM_DELETED_FUNCTION;
+ InstSwitch(const InstSwitch &) = delete;
+ InstSwitch &operator=(const InstSwitch &) = delete;
void destroy(Cfg *Func) override {
Func->deallocateArrayOf<uint64_t>(Values);
Func->deallocateArrayOf<CfgNode *>(Labels);
@@ -682,8 +681,8 @@
private:
InstUnreachable(Cfg *Func);
- InstUnreachable(const InstUnreachable &) LLVM_DELETED_FUNCTION;
- InstUnreachable &operator=(const InstUnreachable &) LLVM_DELETED_FUNCTION;
+ InstUnreachable(const InstUnreachable &) = delete;
+ InstUnreachable &operator=(const InstUnreachable &) = delete;
~InstUnreachable() override {}
};
@@ -711,8 +710,8 @@
private:
InstFakeDef(Cfg *Func, Variable *Dest, Variable *Src);
- InstFakeDef(const InstFakeDef &) LLVM_DELETED_FUNCTION;
- InstFakeDef &operator=(const InstFakeDef &) LLVM_DELETED_FUNCTION;
+ InstFakeDef(const InstFakeDef &) = delete;
+ InstFakeDef &operator=(const InstFakeDef &) = delete;
~InstFakeDef() override {}
};
@@ -733,8 +732,8 @@
private:
InstFakeUse(Cfg *Func, Variable *Src);
- InstFakeUse(const InstFakeUse &) LLVM_DELETED_FUNCTION;
- InstFakeUse &operator=(const InstFakeUse &) LLVM_DELETED_FUNCTION;
+ InstFakeUse(const InstFakeUse &) = delete;
+ InstFakeUse &operator=(const InstFakeUse &) = delete;
~InstFakeUse() override {}
};
@@ -762,8 +761,8 @@
private:
InstFakeKill(Cfg *Func, const VarList &KilledRegs, const Inst *Linked);
- InstFakeKill(const InstFakeKill &) LLVM_DELETED_FUNCTION;
- InstFakeKill &operator=(const InstFakeKill &) LLVM_DELETED_FUNCTION;
+ InstFakeKill(const InstFakeKill &) = delete;
+ InstFakeKill &operator=(const InstFakeKill &) = delete;
~InstFakeKill() override {}
// This instruction is ignored if Linked->isDeleted() is true.
@@ -773,8 +772,8 @@
// The Target instruction is the base class for all target-specific
// instructions.
class InstTarget : public Inst {
- InstTarget(const InstTarget &) LLVM_DELETED_FUNCTION;
- InstTarget &operator=(const InstTarget &) LLVM_DELETED_FUNCTION;
+ InstTarget(const InstTarget &) = delete;
+ InstTarget &operator=(const InstTarget &) = delete;
public:
uint32_t getEmitInstCount() const override { return 1; }
diff --git a/src/IceInstX8632.h b/src/IceInstX8632.h
index 9facb2b..767d8c9 100644
--- a/src/IceInstX8632.h
+++ b/src/IceInstX8632.h
@@ -47,8 +47,8 @@
~OperandX8632() override {}
private:
- OperandX8632(const OperandX8632 &) LLVM_DELETED_FUNCTION;
- OperandX8632 &operator=(const OperandX8632 &) LLVM_DELETED_FUNCTION;
+ OperandX8632(const OperandX8632 &) = delete;
+ OperandX8632 &operator=(const OperandX8632 &) = delete;
};
// OperandX8632Mem represents the m32 addressing mode, with optional
@@ -87,8 +87,8 @@
private:
OperandX8632Mem(Cfg *Func, Type Ty, Variable *Base, Constant *Offset,
Variable *Index, uint16_t Shift, SegmentRegisters SegmentReg);
- OperandX8632Mem(const OperandX8632Mem &) LLVM_DELETED_FUNCTION;
- OperandX8632Mem &operator=(const OperandX8632Mem &) LLVM_DELETED_FUNCTION;
+ OperandX8632Mem(const OperandX8632Mem &) = delete;
+ OperandX8632Mem &operator=(const OperandX8632Mem &) = delete;
~OperandX8632Mem() override {}
Variable *Base;
Constant *Offset;
@@ -128,8 +128,8 @@
Vars[0] = Var;
NumVars = 1;
}
- VariableSplit(const VariableSplit &) LLVM_DELETED_FUNCTION;
- VariableSplit &operator=(const VariableSplit &) LLVM_DELETED_FUNCTION;
+ VariableSplit(const VariableSplit &) = delete;
+ VariableSplit &operator=(const VariableSplit &) = delete;
~VariableSplit() override { Func->deallocateArrayOf<Variable *>(Vars); }
Cfg *Func; // Held only for the destructor.
Variable *Var;
@@ -263,8 +263,8 @@
}
private:
- InstX8632(const InstX8632 &) LLVM_DELETED_FUNCTION;
- InstX8632 &operator=(const InstX8632 &) LLVM_DELETED_FUNCTION;
+ InstX8632(const InstX8632 &) = delete;
+ InstX8632 &operator=(const InstX8632 &) = delete;
};
// InstX8632Label represents an intra-block label that is the
@@ -316,8 +316,8 @@
private:
InstX8632Label(Cfg *Func, TargetX8632 *Target);
- InstX8632Label(const InstX8632Label &) LLVM_DELETED_FUNCTION;
- InstX8632Label &operator=(const InstX8632Label &) LLVM_DELETED_FUNCTION;
+ InstX8632Label(const InstX8632Label &) = delete;
+ InstX8632Label &operator=(const InstX8632Label &) = delete;
~InstX8632Label() override {}
SizeT Number; // used only for unique label string generation
};
@@ -378,8 +378,8 @@
private:
InstX8632Br(Cfg *Func, const CfgNode *TargetTrue, const CfgNode *TargetFalse,
const InstX8632Label *Label, CondX86::BrCond Condition);
- InstX8632Br(const InstX8632Br &) LLVM_DELETED_FUNCTION;
- InstX8632Br &operator=(const InstX8632Br &) LLVM_DELETED_FUNCTION;
+ InstX8632Br(const InstX8632Br &) = delete;
+ InstX8632Br &operator=(const InstX8632Br &) = delete;
~InstX8632Br() override {}
CondX86::BrCond Condition;
const CfgNode *TargetTrue;
@@ -402,9 +402,8 @@
private:
InstX8632AdjustStack(Cfg *Func, SizeT Amount, Variable *Esp);
- InstX8632AdjustStack(const InstX8632AdjustStack &) LLVM_DELETED_FUNCTION;
- InstX8632AdjustStack &operator=(const InstX8632AdjustStack &)
- LLVM_DELETED_FUNCTION;
+ InstX8632AdjustStack(const InstX8632AdjustStack &) = delete;
+ InstX8632AdjustStack &operator=(const InstX8632AdjustStack &) = delete;
SizeT Amount;
};
@@ -422,8 +421,8 @@
private:
InstX8632Call(Cfg *Func, Variable *Dest, Operand *CallTarget);
- InstX8632Call(const InstX8632Call &) LLVM_DELETED_FUNCTION;
- InstX8632Call &operator=(const InstX8632Call &) LLVM_DELETED_FUNCTION;
+ InstX8632Call(const InstX8632Call &) = delete;
+ InstX8632Call &operator=(const InstX8632Call &) = delete;
~InstX8632Call() override {}
};
@@ -465,9 +464,8 @@
: InstX8632(Func, K, 1, llvm::dyn_cast<Variable>(SrcDest)) {
addSource(SrcDest);
}
- InstX8632InplaceopGPR(const InstX8632InplaceopGPR &) LLVM_DELETED_FUNCTION;
- InstX8632InplaceopGPR &
- operator=(const InstX8632InplaceopGPR &) LLVM_DELETED_FUNCTION;
+ InstX8632InplaceopGPR(const InstX8632InplaceopGPR &) = delete;
+ InstX8632InplaceopGPR &operator=(const InstX8632InplaceopGPR &) = delete;
~InstX8632InplaceopGPR() override {}
static const char *Opcode;
static const x86::AssemblerX86::GPREmitterOneOp Emitter;
@@ -516,9 +514,8 @@
: InstX8632(Func, K, 1, Dest) {
addSource(Src);
}
- InstX8632UnaryopGPR(const InstX8632UnaryopGPR &) LLVM_DELETED_FUNCTION;
- InstX8632UnaryopGPR &
- operator=(const InstX8632UnaryopGPR &) LLVM_DELETED_FUNCTION;
+ InstX8632UnaryopGPR(const InstX8632UnaryopGPR &) = delete;
+ InstX8632UnaryopGPR &operator=(const InstX8632UnaryopGPR &) = delete;
~InstX8632UnaryopGPR() override {}
static const char *Opcode;
static const x86::AssemblerX86::GPREmitterRegOp Emitter;
@@ -562,9 +559,8 @@
: InstX8632(Func, K, 1, Dest) {
addSource(Src);
}
- InstX8632UnaryopXmm(const InstX8632UnaryopXmm &) LLVM_DELETED_FUNCTION;
- InstX8632UnaryopXmm &
- operator=(const InstX8632UnaryopXmm &) LLVM_DELETED_FUNCTION;
+ InstX8632UnaryopXmm(const InstX8632UnaryopXmm &) = delete;
+ InstX8632UnaryopXmm &operator=(const InstX8632UnaryopXmm &) = delete;
~InstX8632UnaryopXmm() override {}
static const char *Opcode;
static const x86::AssemblerX86::XmmEmitterTwoOps Emitter;
@@ -600,8 +596,8 @@
addSource(Dest);
addSource(Source);
}
- InstX8632Binop(const InstX8632Binop &) LLVM_DELETED_FUNCTION;
- InstX8632Binop &operator=(const InstX8632Binop &) LLVM_DELETED_FUNCTION;
+ InstX8632Binop(const InstX8632Binop &) = delete;
+ InstX8632Binop &operator=(const InstX8632Binop &) = delete;
~InstX8632Binop() override {}
static const char *Opcode;
};
@@ -637,8 +633,8 @@
addSource(Dest);
addSource(Source);
}
- InstX8632BinopGPR(const InstX8632BinopGPR &) LLVM_DELETED_FUNCTION;
- InstX8632BinopGPR &operator=(const InstX8632BinopGPR &) LLVM_DELETED_FUNCTION;
+ InstX8632BinopGPR(const InstX8632BinopGPR &) = delete;
+ InstX8632BinopGPR &operator=(const InstX8632BinopGPR &) = delete;
~InstX8632BinopGPR() override {}
static const char *Opcode;
static const x86::AssemblerX86::GPREmitterRegOp Emitter;
@@ -677,8 +673,8 @@
addSource(Dest);
addSource(Source);
}
- InstX8632BinopXmm(const InstX8632BinopXmm &) LLVM_DELETED_FUNCTION;
- InstX8632BinopXmm &operator=(const InstX8632BinopXmm &) LLVM_DELETED_FUNCTION;
+ InstX8632BinopXmm(const InstX8632BinopXmm &) = delete;
+ InstX8632BinopXmm &operator=(const InstX8632BinopXmm &) = delete;
~InstX8632BinopXmm() override {}
static const char *Opcode;
static const x86::AssemblerX86::XmmEmitterTwoOps Emitter;
@@ -719,8 +715,8 @@
addSource(Source1);
addSource(Source2);
}
- InstX8632Ternop(const InstX8632Ternop &) LLVM_DELETED_FUNCTION;
- InstX8632Ternop &operator=(const InstX8632Ternop &) LLVM_DELETED_FUNCTION;
+ InstX8632Ternop(const InstX8632Ternop &) = delete;
+ InstX8632Ternop &operator=(const InstX8632Ternop &) = delete;
~InstX8632Ternop() override {}
static const char *Opcode;
};
@@ -760,10 +756,8 @@
addSource(Source0);
addSource(Source1);
}
- InstX8632ThreeAddressop(const InstX8632ThreeAddressop &)
- LLVM_DELETED_FUNCTION;
- InstX8632ThreeAddressop &
- operator=(const InstX8632ThreeAddressop &) LLVM_DELETED_FUNCTION;
+ InstX8632ThreeAddressop(const InstX8632ThreeAddressop &) = delete;
+ InstX8632ThreeAddressop &operator=(const InstX8632ThreeAddressop &) = delete;
~InstX8632ThreeAddressop() override {}
static const char *Opcode;
};
@@ -797,8 +791,8 @@
: InstX8632(Func, K, 1, Dest) {
addSource(Source);
}
- InstX8632Movlike(const InstX8632Movlike &) LLVM_DELETED_FUNCTION;
- InstX8632Movlike &operator=(const InstX8632Movlike &) LLVM_DELETED_FUNCTION;
+ InstX8632Movlike(const InstX8632Movlike &) = delete;
+ InstX8632Movlike &operator=(const InstX8632Movlike &) = delete;
~InstX8632Movlike() override {}
static const char *Opcode;
@@ -884,8 +878,8 @@
~InstX8632Lockable() override {}
private:
- InstX8632Lockable(const InstX8632Lockable &) LLVM_DELETED_FUNCTION;
- InstX8632Lockable &operator=(const InstX8632Lockable &) LLVM_DELETED_FUNCTION;
+ InstX8632Lockable(const InstX8632Lockable &) = delete;
+ InstX8632Lockable &operator=(const InstX8632Lockable &) = delete;
};
// Mul instruction - unsigned multiply.
@@ -903,8 +897,8 @@
private:
InstX8632Mul(Cfg *Func, Variable *Dest, Variable *Source1, Operand *Source2);
- InstX8632Mul(const InstX8632Mul &) LLVM_DELETED_FUNCTION;
- InstX8632Mul &operator=(const InstX8632Mul &) LLVM_DELETED_FUNCTION;
+ InstX8632Mul(const InstX8632Mul &) = delete;
+ InstX8632Mul &operator=(const InstX8632Mul &) = delete;
~InstX8632Mul() override {}
};
@@ -924,8 +918,8 @@
private:
InstX8632Shld(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2);
- InstX8632Shld(const InstX8632Shld &) LLVM_DELETED_FUNCTION;
- InstX8632Shld &operator=(const InstX8632Shld &) LLVM_DELETED_FUNCTION;
+ InstX8632Shld(const InstX8632Shld &) = delete;
+ InstX8632Shld &operator=(const InstX8632Shld &) = delete;
~InstX8632Shld() override {}
};
@@ -945,8 +939,8 @@
private:
InstX8632Shrd(Cfg *Func, Variable *Dest, Variable *Source1,
Variable *Source2);
- InstX8632Shrd(const InstX8632Shrd &) LLVM_DELETED_FUNCTION;
- InstX8632Shrd &operator=(const InstX8632Shrd &) LLVM_DELETED_FUNCTION;
+ InstX8632Shrd(const InstX8632Shrd &) = delete;
+ InstX8632Shrd &operator=(const InstX8632Shrd &) = delete;
~InstX8632Shrd() override {}
};
@@ -966,8 +960,8 @@
private:
InstX8632Cmov(Cfg *Func, Variable *Dest, Operand *Source,
CondX86::BrCond Cond);
- InstX8632Cmov(const InstX8632Cmov &) LLVM_DELETED_FUNCTION;
- InstX8632Cmov &operator=(const InstX8632Cmov &) LLVM_DELETED_FUNCTION;
+ InstX8632Cmov(const InstX8632Cmov &) = delete;
+ InstX8632Cmov &operator=(const InstX8632Cmov &) = delete;
~InstX8632Cmov() override {}
CondX86::BrCond Condition;
@@ -990,8 +984,8 @@
private:
InstX8632Cmpps(Cfg *Func, Variable *Dest, Operand *Source,
CondX86::CmppsCond Cond);
- InstX8632Cmpps(const InstX8632Cmpps &) LLVM_DELETED_FUNCTION;
- InstX8632Cmpps &operator=(const InstX8632Cmpps &) LLVM_DELETED_FUNCTION;
+ InstX8632Cmpps(const InstX8632Cmpps &) = delete;
+ InstX8632Cmpps &operator=(const InstX8632Cmpps &) = delete;
~InstX8632Cmpps() override {}
CondX86::CmppsCond Condition;
@@ -1017,8 +1011,8 @@
private:
InstX8632Cmpxchg(Cfg *Func, Operand *DestOrAddr, Variable *Eax,
Variable *Desired, bool Locked);
- InstX8632Cmpxchg(const InstX8632Cmpxchg &) LLVM_DELETED_FUNCTION;
- InstX8632Cmpxchg &operator=(const InstX8632Cmpxchg &) LLVM_DELETED_FUNCTION;
+ InstX8632Cmpxchg(const InstX8632Cmpxchg &) = delete;
+ InstX8632Cmpxchg &operator=(const InstX8632Cmpxchg &) = delete;
~InstX8632Cmpxchg() override {}
};
@@ -1044,9 +1038,8 @@
private:
InstX8632Cmpxchg8b(Cfg *Func, OperandX8632Mem *Dest, Variable *Edx,
Variable *Eax, Variable *Ecx, Variable *Ebx, bool Locked);
- InstX8632Cmpxchg8b(const InstX8632Cmpxchg8b &) LLVM_DELETED_FUNCTION;
- InstX8632Cmpxchg8b &
- operator=(const InstX8632Cmpxchg8b &) LLVM_DELETED_FUNCTION;
+ InstX8632Cmpxchg8b(const InstX8632Cmpxchg8b &) = delete;
+ InstX8632Cmpxchg8b &operator=(const InstX8632Cmpxchg8b &) = delete;
~InstX8632Cmpxchg8b() override {}
};
@@ -1068,8 +1061,8 @@
private:
bool Trunc;
InstX8632Cvt(Cfg *Func, Variable *Dest, Operand *Source, bool Trunc);
- InstX8632Cvt(const InstX8632Cvt &) LLVM_DELETED_FUNCTION;
- InstX8632Cvt &operator=(const InstX8632Cvt &) LLVM_DELETED_FUNCTION;
+ InstX8632Cvt(const InstX8632Cvt &) = delete;
+ InstX8632Cvt &operator=(const InstX8632Cvt &) = delete;
~InstX8632Cvt() override {}
};
@@ -1086,8 +1079,8 @@
private:
InstX8632Icmp(Cfg *Func, Operand *Src1, Operand *Src2);
- InstX8632Icmp(const InstX8632Icmp &) LLVM_DELETED_FUNCTION;
- InstX8632Icmp &operator=(const InstX8632Icmp &) LLVM_DELETED_FUNCTION;
+ InstX8632Icmp(const InstX8632Icmp &) = delete;
+ InstX8632Icmp &operator=(const InstX8632Icmp &) = delete;
~InstX8632Icmp() override {}
};
@@ -1105,8 +1098,8 @@
private:
InstX8632Ucomiss(Cfg *Func, Operand *Src1, Operand *Src2);
- InstX8632Ucomiss(const InstX8632Ucomiss &) LLVM_DELETED_FUNCTION;
- InstX8632Ucomiss &operator=(const InstX8632Ucomiss &) LLVM_DELETED_FUNCTION;
+ InstX8632Ucomiss(const InstX8632Ucomiss &) = delete;
+ InstX8632Ucomiss &operator=(const InstX8632Ucomiss &) = delete;
~InstX8632Ucomiss() override {}
};
@@ -1122,8 +1115,8 @@
private:
InstX8632UD2(Cfg *Func);
- InstX8632UD2(const InstX8632UD2 &) LLVM_DELETED_FUNCTION;
- InstX8632UD2 &operator=(const InstX8632UD2 &) LLVM_DELETED_FUNCTION;
+ InstX8632UD2(const InstX8632UD2 &) = delete;
+ InstX8632UD2 &operator=(const InstX8632UD2 &) = delete;
~InstX8632UD2() override {}
};
@@ -1140,8 +1133,8 @@
private:
InstX8632Test(Cfg *Func, Operand *Source1, Operand *Source2);
- InstX8632Test(const InstX8632Test &) LLVM_DELETED_FUNCTION;
- InstX8632Test &operator=(const InstX8632Test &) LLVM_DELETED_FUNCTION;
+ InstX8632Test(const InstX8632Test &) = delete;
+ InstX8632Test &operator=(const InstX8632Test &) = delete;
~InstX8632Test() override {}
};
@@ -1158,8 +1151,8 @@
private:
InstX8632Mfence(Cfg *Func);
- InstX8632Mfence(const InstX8632Mfence &) LLVM_DELETED_FUNCTION;
- InstX8632Mfence &operator=(const InstX8632Mfence &) LLVM_DELETED_FUNCTION;
+ InstX8632Mfence(const InstX8632Mfence &) = delete;
+ InstX8632Mfence &operator=(const InstX8632Mfence &) = delete;
~InstX8632Mfence() override {}
};
@@ -1178,8 +1171,8 @@
private:
InstX8632Store(Cfg *Func, Operand *Value, OperandX8632 *Mem);
- InstX8632Store(const InstX8632Store &) LLVM_DELETED_FUNCTION;
- InstX8632Store &operator=(const InstX8632Store &) LLVM_DELETED_FUNCTION;
+ InstX8632Store(const InstX8632Store &) = delete;
+ InstX8632Store &operator=(const InstX8632Store &) = delete;
~InstX8632Store() override {}
};
@@ -1195,8 +1188,8 @@
private:
InstX8632StoreP(Cfg *Func, Operand *Value, OperandX8632 *Mem);
- InstX8632StoreP(const InstX8632StoreP &) LLVM_DELETED_FUNCTION;
- InstX8632StoreP &operator=(const InstX8632StoreP &) LLVM_DELETED_FUNCTION;
+ InstX8632StoreP(const InstX8632StoreP &) = delete;
+ InstX8632StoreP &operator=(const InstX8632StoreP &) = delete;
~InstX8632StoreP() override {}
};
@@ -1215,8 +1208,8 @@
private:
InstX8632StoreQ(Cfg *Func, Operand *Value, OperandX8632 *Mem);
- InstX8632StoreQ(const InstX8632StoreQ &) LLVM_DELETED_FUNCTION;
- InstX8632StoreQ &operator=(const InstX8632StoreQ &) LLVM_DELETED_FUNCTION;
+ InstX8632StoreQ(const InstX8632StoreQ &) = delete;
+ InstX8632StoreQ &operator=(const InstX8632StoreQ &) = delete;
~InstX8632StoreQ() override {}
};
@@ -1234,8 +1227,8 @@
private:
InstX8632Movsx(Cfg *Func, Variable *Dest, Operand *Source);
- InstX8632Movsx(const InstX8632Movsx &) LLVM_DELETED_FUNCTION;
- InstX8632Movsx &operator=(const InstX8632Movsx &) LLVM_DELETED_FUNCTION;
+ InstX8632Movsx(const InstX8632Movsx &) = delete;
+ InstX8632Movsx &operator=(const InstX8632Movsx &) = delete;
~InstX8632Movsx() override {}
};
@@ -1253,8 +1246,8 @@
private:
InstX8632Movzx(Cfg *Func, Variable *Dest, Operand *Source);
- InstX8632Movzx(const InstX8632Movzx &) LLVM_DELETED_FUNCTION;
- InstX8632Movzx &operator=(const InstX8632Movzx &) LLVM_DELETED_FUNCTION;
+ InstX8632Movzx(const InstX8632Movzx &) = delete;
+ InstX8632Movzx &operator=(const InstX8632Movzx &) = delete;
~InstX8632Movzx() override {}
};
@@ -1274,8 +1267,8 @@
private:
InstX8632Nop(Cfg *Func, SizeT Length);
- InstX8632Nop(const InstX8632Nop &) LLVM_DELETED_FUNCTION;
- InstX8632Nop &operator=(const InstX8632Nop &) LLVM_DELETED_FUNCTION;
+ InstX8632Nop(const InstX8632Nop &) = delete;
+ InstX8632Nop &operator=(const InstX8632Nop &) = delete;
~InstX8632Nop() override {}
NopVariant Variant;
@@ -1293,8 +1286,8 @@
private:
InstX8632Fld(Cfg *Func, Operand *Src);
- InstX8632Fld(const InstX8632Fld &) LLVM_DELETED_FUNCTION;
- InstX8632Fld &operator=(const InstX8632Fld &) LLVM_DELETED_FUNCTION;
+ InstX8632Fld(const InstX8632Fld &) = delete;
+ InstX8632Fld &operator=(const InstX8632Fld &) = delete;
~InstX8632Fld() override {}
};
@@ -1310,8 +1303,8 @@
private:
InstX8632Fstp(Cfg *Func, Variable *Dest);
- InstX8632Fstp(const InstX8632Fstp &) LLVM_DELETED_FUNCTION;
- InstX8632Fstp &operator=(const InstX8632Fstp &) LLVM_DELETED_FUNCTION;
+ InstX8632Fstp(const InstX8632Fstp &) = delete;
+ InstX8632Fstp &operator=(const InstX8632Fstp &) = delete;
~InstX8632Fstp() override {}
};
@@ -1327,8 +1320,8 @@
private:
InstX8632Pop(Cfg *Func, Variable *Dest);
- InstX8632Pop(const InstX8632Pop &) LLVM_DELETED_FUNCTION;
- InstX8632Pop &operator=(const InstX8632Pop &) LLVM_DELETED_FUNCTION;
+ InstX8632Pop(const InstX8632Pop &) = delete;
+ InstX8632Pop &operator=(const InstX8632Pop &) = delete;
~InstX8632Pop() override {}
};
@@ -1345,8 +1338,8 @@
private:
InstX8632Push(Cfg *Func, Operand *Source, bool SuppressStackAdjustment);
- InstX8632Push(const InstX8632Push &) LLVM_DELETED_FUNCTION;
- InstX8632Push &operator=(const InstX8632Push &) LLVM_DELETED_FUNCTION;
+ InstX8632Push(const InstX8632Push &) = delete;
+ InstX8632Push &operator=(const InstX8632Push &) = delete;
bool SuppressStackAdjustment;
~InstX8632Push() override {}
};
@@ -1367,8 +1360,8 @@
private:
InstX8632Ret(Cfg *Func, Variable *Source);
- InstX8632Ret(const InstX8632Ret &) LLVM_DELETED_FUNCTION;
- InstX8632Ret &operator=(const InstX8632Ret &) LLVM_DELETED_FUNCTION;
+ InstX8632Ret(const InstX8632Ret &) = delete;
+ InstX8632Ret &operator=(const InstX8632Ret &) = delete;
~InstX8632Ret() override {}
};
@@ -1393,8 +1386,8 @@
private:
InstX8632Xadd(Cfg *Func, Operand *Dest, Variable *Source, bool Locked);
- InstX8632Xadd(const InstX8632Xadd &) LLVM_DELETED_FUNCTION;
- InstX8632Xadd &operator=(const InstX8632Xadd &) LLVM_DELETED_FUNCTION;
+ InstX8632Xadd(const InstX8632Xadd &) = delete;
+ InstX8632Xadd &operator=(const InstX8632Xadd &) = delete;
~InstX8632Xadd() override {}
};
@@ -1417,8 +1410,8 @@
private:
InstX8632Xchg(Cfg *Func, Operand *Dest, Variable *Source);
- InstX8632Xchg(const InstX8632Xchg &) LLVM_DELETED_FUNCTION;
- InstX8632Xchg &operator=(const InstX8632Xchg &) LLVM_DELETED_FUNCTION;
+ InstX8632Xchg(const InstX8632Xchg &) = delete;
+ InstX8632Xchg &operator=(const InstX8632Xchg &) = delete;
~InstX8632Xchg() override {}
};
diff --git a/src/IceIntrinsics.h b/src/IceIntrinsics.h
index 7931539..429142b 100644
--- a/src/IceIntrinsics.h
+++ b/src/IceIntrinsics.h
@@ -159,8 +159,8 @@
typedef std::map<IceString, FullIntrinsicInfo> IntrinsicMap;
IntrinsicMap Map;
- Intrinsics(const Intrinsics &) LLVM_DELETED_FUNCTION;
- Intrinsics &operator=(const Intrinsics &) LLVM_DELETED_FUNCTION;
+ Intrinsics(const Intrinsics &) = delete;
+ Intrinsics &operator=(const Intrinsics &) = delete;
};
} // end of namespace Ice
diff --git a/src/IceLiveness.h b/src/IceLiveness.h
index e58f426..031f4e9 100644
--- a/src/IceLiveness.h
+++ b/src/IceLiveness.h
@@ -46,8 +46,8 @@
private:
// TODO: Disable these constructors when Liveness::Nodes is no
// longer an STL container.
- // LivenessNode(const LivenessNode &) LLVM_DELETED_FUNCTION;
- // LivenessNode &operator=(const LivenessNode &) LLVM_DELETED_FUNCTION;
+ // LivenessNode(const LivenessNode &) = delete;
+ // LivenessNode &operator=(const LivenessNode &) = delete;
};
class Liveness {
@@ -91,8 +91,8 @@
std::vector<Variable *> LiveToVarMap;
// LiveRanges maps a Variable::Number to its live range.
std::vector<LiveRange> LiveRanges;
- Liveness(const Liveness &) LLVM_DELETED_FUNCTION;
- Liveness &operator=(const Liveness &) LLVM_DELETED_FUNCTION;
+ Liveness(const Liveness &) = delete;
+ Liveness &operator=(const Liveness &) = delete;
};
} // end of namespace Ice
diff --git a/src/IceOperand.h b/src/IceOperand.h
index c0f699f..25f80b3 100644
--- a/src/IceOperand.h
+++ b/src/IceOperand.h
@@ -86,8 +86,8 @@
Variable **Vars;
private:
- Operand(const Operand &) LLVM_DELETED_FUNCTION;
- Operand &operator=(const Operand &) LLVM_DELETED_FUNCTION;
+ Operand(const Operand &) = delete;
+ Operand &operator=(const Operand &) = delete;
};
template<class StreamType>
@@ -124,8 +124,8 @@
const uint32_t PoolEntryID;
private:
- Constant(const Constant &) LLVM_DELETED_FUNCTION;
- Constant &operator=(const Constant &) LLVM_DELETED_FUNCTION;
+ Constant(const Constant &) = delete;
+ Constant &operator=(const Constant &) = delete;
};
// ConstantPrimitive<> wraps a primitive type.
@@ -152,8 +152,8 @@
private:
ConstantPrimitive(Type Ty, T Value, uint32_t PoolEntryID)
: Constant(K, Ty, PoolEntryID), Value(Value) {}
- ConstantPrimitive(const ConstantPrimitive &) LLVM_DELETED_FUNCTION;
- ConstantPrimitive &operator=(const ConstantPrimitive &) LLVM_DELETED_FUNCTION;
+ ConstantPrimitive(const ConstantPrimitive &) = delete;
+ ConstantPrimitive &operator=(const ConstantPrimitive &) = delete;
~ConstantPrimitive() override {}
const T Value;
};
@@ -180,7 +180,7 @@
// ConstantRelocatable can fit into the global constant pool
// template mechanism.
class RelocatableTuple {
- RelocatableTuple &operator=(const RelocatableTuple &) LLVM_DELETED_FUNCTION;
+ RelocatableTuple &operator=(const RelocatableTuple &) = delete;
public:
RelocatableTuple(const int64_t Offset, const IceString &Name,
@@ -226,9 +226,8 @@
bool SuppressMangling, uint32_t PoolEntryID)
: Constant(kConstRelocatable, Ty, PoolEntryID), Offset(Offset),
Name(Name), SuppressMangling(SuppressMangling) {}
- ConstantRelocatable(const ConstantRelocatable &) LLVM_DELETED_FUNCTION;
- ConstantRelocatable &
- operator=(const ConstantRelocatable &) LLVM_DELETED_FUNCTION;
+ ConstantRelocatable(const ConstantRelocatable &) = delete;
+ ConstantRelocatable &operator=(const ConstantRelocatable &) = delete;
~ConstantRelocatable() override {}
const int64_t Offset; // fixed offset to add
const IceString Name; // optional for debug/dump
@@ -258,8 +257,8 @@
private:
ConstantUndef(Type Ty, uint32_t PoolEntryID)
: Constant(kConstUndef, Ty, PoolEntryID) {}
- ConstantUndef(const ConstantUndef &) LLVM_DELETED_FUNCTION;
- ConstantUndef &operator=(const ConstantUndef &) LLVM_DELETED_FUNCTION;
+ ConstantUndef(const ConstantUndef &) = delete;
+ ConstantUndef &operator=(const ConstantUndef &) = delete;
~ConstantUndef() override {}
};
@@ -344,8 +343,8 @@
// stack-allocated. If it is register-allocated, it will ultimately
// have a non-negative RegNum field.
class Variable : public Operand {
- Variable(const Variable &) LLVM_DELETED_FUNCTION;
- Variable &operator=(const Variable &) LLVM_DELETED_FUNCTION;
+ Variable(const Variable &) = delete;
+ Variable &operator=(const Variable &) = delete;
Variable(Variable &&V) = default;
public:
@@ -499,7 +498,7 @@
void markDef(const Inst *Instr, const CfgNode *Node);
private:
- VariableTracking &operator=(const VariableTracking &) LLVM_DELETED_FUNCTION;
+ VariableTracking &operator=(const VariableTracking &) = delete;
MultiDefState MultiDef;
MultiBlockState MultiBlock;
const CfgNode *SingleUseNode;
@@ -560,8 +559,8 @@
const Cfg *Func;
std::vector<VariableTracking> Metadata;
const static InstDefList NoDefinitions;
- VariablesMetadata(const VariablesMetadata &) LLVM_DELETED_FUNCTION;
- VariablesMetadata &operator=(const VariablesMetadata &) LLVM_DELETED_FUNCTION;
+ VariablesMetadata(const VariablesMetadata &) = delete;
+ VariablesMetadata &operator=(const VariablesMetadata &) = delete;
};
} // end of namespace Ice
diff --git a/src/IceRNG.h b/src/IceRNG.h
index 4260b4e..9c4eeda 100644
--- a/src/IceRNG.h
+++ b/src/IceRNG.h
@@ -27,9 +27,8 @@
uint64_t next(uint64_t Max);
private:
- RandomNumberGenerator(const RandomNumberGenerator &) LLVM_DELETED_FUNCTION;
- RandomNumberGenerator &
- operator=(const RandomNumberGenerator &) LLVM_DELETED_FUNCTION;
+ RandomNumberGenerator(const RandomNumberGenerator &) = delete;
+ RandomNumberGenerator &operator=(const RandomNumberGenerator &) = delete;
uint64_t State;
};
@@ -44,10 +43,9 @@
RandomNumberGeneratorWrapper(RandomNumberGenerator &RNG) : RNG(RNG) {}
private:
- RandomNumberGeneratorWrapper(const RandomNumberGeneratorWrapper &)
- LLVM_DELETED_FUNCTION;
+ RandomNumberGeneratorWrapper(const RandomNumberGeneratorWrapper &) = delete;
RandomNumberGeneratorWrapper &
- operator=(const RandomNumberGeneratorWrapper &) LLVM_DELETED_FUNCTION;
+ operator=(const RandomNumberGeneratorWrapper &) = delete;
RandomNumberGenerator &RNG;
};
diff --git a/src/IceRegAlloc.h b/src/IceRegAlloc.h
index edcf266..791b349 100644
--- a/src/IceRegAlloc.h
+++ b/src/IceRegAlloc.h
@@ -43,8 +43,8 @@
void dump(const Cfg *Func) const;
private:
- // LiveRangeWrapper(const LiveRangeWrapper &) LLVM_DELETED_FUNCTION;
- LiveRangeWrapper &operator=(const LiveRangeWrapper &) LLVM_DELETED_FUNCTION;
+ // LiveRangeWrapper(const LiveRangeWrapper &) = delete;
+ LiveRangeWrapper &operator=(const LiveRangeWrapper &) = delete;
};
class LinearScan {
@@ -72,8 +72,8 @@
typedef std::list<LiveRangeWrapper> UnorderedRanges;
OrderedRanges Unhandled;
UnorderedRanges Active, Inactive, Handled;
- LinearScan(const LinearScan &) LLVM_DELETED_FUNCTION;
- LinearScan &operator=(const LinearScan &) LLVM_DELETED_FUNCTION;
+ LinearScan(const LinearScan &) = delete;
+ LinearScan &operator=(const LinearScan &) = delete;
};
} // end of namespace Ice
diff --git a/src/IceTargetLowering.h b/src/IceTargetLowering.h
index 43e6a01..82d0f59 100644
--- a/src/IceTargetLowering.h
+++ b/src/IceTargetLowering.h
@@ -86,8 +86,8 @@
void skipDeleted(InstList::iterator &I) const;
void advanceForward(InstList::iterator &I) const;
void advanceBackward(InstList::iterator &I) const;
- LoweringContext(const LoweringContext &) LLVM_DELETED_FUNCTION;
- LoweringContext &operator=(const LoweringContext &) LLVM_DELETED_FUNCTION;
+ LoweringContext(const LoweringContext &) = delete;
+ LoweringContext &operator=(const LoweringContext &) = delete;
};
class TargetLowering {
@@ -235,8 +235,8 @@
LoweringContext Context;
private:
- TargetLowering(const TargetLowering &) LLVM_DELETED_FUNCTION;
- TargetLowering &operator=(const TargetLowering &) LLVM_DELETED_FUNCTION;
+ TargetLowering(const TargetLowering &) = delete;
+ TargetLowering &operator=(const TargetLowering &) = delete;
};
// TargetGlobalInitLowering is used for "lowering" global
@@ -258,10 +258,9 @@
GlobalContext *Ctx;
private:
- TargetGlobalInitLowering(const TargetGlobalInitLowering &)
- LLVM_DELETED_FUNCTION;
- TargetGlobalInitLowering &
- operator=(const TargetGlobalInitLowering &) LLVM_DELETED_FUNCTION;
+ TargetGlobalInitLowering(const TargetGlobalInitLowering &) = delete;
+ TargetGlobalInitLowering &operator=(const TargetGlobalInitLowering &) =
+ delete;
};
} // end of namespace Ice
diff --git a/src/IceTargetLoweringX8632.h b/src/IceTargetLoweringX8632.h
index e2291a3..eb3cb70 100644
--- a/src/IceTargetLoweringX8632.h
+++ b/src/IceTargetLoweringX8632.h
@@ -475,8 +475,8 @@
static IceString RegNames[];
private:
- TargetX8632(const TargetX8632 &) LLVM_DELETED_FUNCTION;
- TargetX8632 &operator=(const TargetX8632 &) LLVM_DELETED_FUNCTION;
+ TargetX8632(const TargetX8632 &) = delete;
+ TargetX8632 &operator=(const TargetX8632 &) = delete;
~TargetX8632() override {}
template <typename T> void emitConstantPool() const;
};
@@ -494,9 +494,8 @@
TargetGlobalInitX8632(GlobalContext *Ctx);
private:
- TargetGlobalInitX8632(const TargetGlobalInitX8632 &) LLVM_DELETED_FUNCTION;
- TargetGlobalInitX8632 &
- operator=(const TargetGlobalInitX8632 &) LLVM_DELETED_FUNCTION;
+ TargetGlobalInitX8632(const TargetGlobalInitX8632 &) = delete;
+ TargetGlobalInitX8632 &operator=(const TargetGlobalInitX8632 &) = delete;
~TargetGlobalInitX8632() override {}
};
diff --git a/src/IceTimerTree.h b/src/IceTimerTree.h
index 114cc6f..029b7f4 100644
--- a/src/IceTimerTree.h
+++ b/src/IceTimerTree.h
@@ -38,8 +38,8 @@
};
class TimerStack {
- TimerStack(const TimerStack &) LLVM_DELETED_FUNCTION;
- TimerStack &operator=(const TimerStack &) LLVM_DELETED_FUNCTION;
+ TimerStack(const TimerStack &) = delete;
+ TimerStack &operator=(const TimerStack &) = delete;
public:
TimerStack(const IceString &TopLevelName);
diff --git a/src/IceTranslator.h b/src/IceTranslator.h
index 9480fb0..b621ffc 100644
--- a/src/IceTranslator.h
+++ b/src/IceTranslator.h
@@ -78,8 +78,8 @@
std::unique_ptr<Cfg> Func;
private:
- Translator(const Translator &) LLVM_DELETED_FUNCTION;
- Translator &operator=(const Translator &) LLVM_DELETED_FUNCTION;
+ Translator(const Translator &) = delete;
+ Translator &operator=(const Translator &) = delete;
};
}
diff --git a/src/IceTypeConverter.h b/src/IceTypeConverter.h
index c067191..59709ce 100644
--- a/src/IceTypeConverter.h
+++ b/src/IceTypeConverter.h
@@ -28,8 +28,8 @@
/// Converts LLVM types to ICE types, and ICE types to LLVM types.
class TypeConverter {
- TypeConverter(const TypeConverter &) LLVM_DELETED_FUNCTION;
- TypeConverter &operator=(const TypeConverter &) LLVM_DELETED_FUNCTION;
+ TypeConverter(const TypeConverter &) = delete;
+ TypeConverter &operator=(const TypeConverter &) = delete;
public:
/// Context is the context to use to build llvm types.
diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
index 0571b29..af78e2f 100644
--- a/src/PNaClTranslator.cpp
+++ b/src/PNaClTranslator.cpp
@@ -51,8 +51,8 @@
// Top-level class to read PNaCl bitcode files, and translate to ICE.
class TopLevelParser : public NaClBitcodeParser {
- TopLevelParser(const TopLevelParser &) LLVM_DELETED_FUNCTION;
- TopLevelParser &operator=(const TopLevelParser &) LLVM_DELETED_FUNCTION;
+ TopLevelParser(const TopLevelParser &) = delete;
+ TopLevelParser &operator=(const TopLevelParser &) = delete;
public:
TopLevelParser(Ice::Translator &Translator, const std::string &InputName,
@@ -767,8 +767,8 @@
/// Base class for parsing a valuesymtab block in the bitcode file.
class ValuesymtabParser : public BlockParserBaseClass {
- ValuesymtabParser(const ValuesymtabParser &) LLVM_DELETED_FUNCTION;
- void operator=(const ValuesymtabParser &) LLVM_DELETED_FUNCTION;
+ ValuesymtabParser(const ValuesymtabParser &) = delete;
+ void operator=(const ValuesymtabParser &) = delete;
public:
ValuesymtabParser(unsigned BlockID, BlockParserBaseClass *EnclosingParser)
@@ -829,8 +829,8 @@
/// Parses function blocks in the bitcode file.
class FunctionParser : public BlockParserBaseClass {
- FunctionParser(const FunctionParser &) LLVM_DELETED_FUNCTION;
- FunctionParser &operator=(const FunctionParser &) LLVM_DELETED_FUNCTION;
+ FunctionParser(const FunctionParser &) = delete;
+ FunctionParser &operator=(const FunctionParser &) = delete;
friend class FunctionValuesymtabParser;
public:
@@ -2012,8 +2012,8 @@
/// Parses constants within a function block.
class ConstantsParser : public BlockParserBaseClass {
- ConstantsParser(const ConstantsParser &) LLVM_DELETED_FUNCTION;
- ConstantsParser &operator=(const ConstantsParser &) LLVM_DELETED_FUNCTION;
+ ConstantsParser(const ConstantsParser &) = delete;
+ ConstantsParser &operator=(const ConstantsParser &) = delete;
public:
ConstantsParser(unsigned BlockID, FunctionParser *FuncParser)
@@ -2128,9 +2128,8 @@
// Parses valuesymtab blocks appearing in a function block.
class FunctionValuesymtabParser : public ValuesymtabParser {
- FunctionValuesymtabParser(const FunctionValuesymtabParser &)
- LLVM_DELETED_FUNCTION;
- void operator=(const FunctionValuesymtabParser &) LLVM_DELETED_FUNCTION;
+ FunctionValuesymtabParser(const FunctionValuesymtabParser &) = delete;
+ void operator=(const FunctionValuesymtabParser &) = delete;
public:
FunctionValuesymtabParser(unsigned BlockID, FunctionParser *EnclosingParser)
@@ -2240,9 +2239,8 @@
};
class ModuleValuesymtabParser : public ValuesymtabParser {
- ModuleValuesymtabParser(const ModuleValuesymtabParser &)
- LLVM_DELETED_FUNCTION;
- void operator=(const ModuleValuesymtabParser &) LLVM_DELETED_FUNCTION;
+ ModuleValuesymtabParser(const ModuleValuesymtabParser &) = delete;
+ void operator=(const ModuleValuesymtabParser &) = delete;
public:
ModuleValuesymtabParser(unsigned BlockID, ModuleParser *MP)
diff --git a/src/PNaClTranslator.h b/src/PNaClTranslator.h
index 464d65b..aa73f83 100644
--- a/src/PNaClTranslator.h
+++ b/src/PNaClTranslator.h
@@ -31,8 +31,8 @@
void translate(const std::string &IRFilename);
private:
- PNaClTranslator(const PNaClTranslator &) LLVM_DELETED_FUNCTION;
- PNaClTranslator &operator=(const PNaClTranslator &) LLVM_DELETED_FUNCTION;
+ PNaClTranslator(const PNaClTranslator &) = delete;
+ PNaClTranslator &operator=(const PNaClTranslator &) = delete;
};
}
diff --git a/src/assembler.h b/src/assembler.h
index 92cc98d..46cf010 100644
--- a/src/assembler.h
+++ b/src/assembler.h
@@ -64,8 +64,8 @@
void set_position(intptr_t position) { position_ = position; }
- AssemblerFixup(const AssemblerFixup &) LLVM_DELETED_FUNCTION;
- AssemblerFixup &operator=(const AssemblerFixup &) LLVM_DELETED_FUNCTION;
+ AssemblerFixup(const AssemblerFixup &) = delete;
+ AssemblerFixup &operator=(const AssemblerFixup &) = delete;
friend class AssemblerBuffer;
};
@@ -213,8 +213,8 @@
private:
llvm::BumpPtrAllocator Allocator;
- Assembler(const Assembler &) LLVM_DELETED_FUNCTION;
- Assembler &operator=(const Assembler &) LLVM_DELETED_FUNCTION;
+ Assembler(const Assembler &) = delete;
+ Assembler &operator=(const Assembler &) = delete;
};
} // end of namespace Ice
diff --git a/src/assembler_ia32.h b/src/assembler_ia32.h
index aecc15f..e4122fd 100644
--- a/src/assembler_ia32.h
+++ b/src/assembler_ia32.h
@@ -60,9 +60,8 @@
private:
DisplacementRelocation(FixupKind Kind, const ConstantRelocatable *Sym)
: AssemblerFixup(Kind, Sym) {}
- DisplacementRelocation(const DisplacementRelocation &) LLVM_DELETED_FUNCTION;
- DisplacementRelocation &
- operator=(const DisplacementRelocation &) LLVM_DELETED_FUNCTION;
+ DisplacementRelocation(const DisplacementRelocation &) = delete;
+ DisplacementRelocation &operator=(const DisplacementRelocation &) = delete;
};
class Immediate {
@@ -320,8 +319,8 @@
intptr_t unresolved_near_positions_[kMaxUnresolvedBranches];
friend class AssemblerX86;
- Label(const Label &) LLVM_DELETED_FUNCTION;
- Label &operator=(const Label &) LLVM_DELETED_FUNCTION;
+ Label(const Label &) = delete;
+ Label &operator=(const Label &) = delete;
};
class AssemblerX86 : public Assembler {
@@ -727,8 +726,8 @@
AssemblerBuffer buffer_;
- AssemblerX86(const AssemblerX86 &) LLVM_DELETED_FUNCTION;
- AssemblerX86 &operator=(const AssemblerX86 &) LLVM_DELETED_FUNCTION;
+ AssemblerX86(const AssemblerX86 &) = delete;
+ AssemblerX86 &operator=(const AssemblerX86 &) = delete;
};
inline void AssemblerX86::EmitUint8(uint8_t value) {
