Subzero: Remove LLVM_DELETED_FUNCTION.

src/IceCfg.h

@@ -184,8 +184,8 @@ private:
   // 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

src/IceCfgNode.h

@@ -71,8 +71,8 @@ public:
 
 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

src/IceConverter.h

@@ -34,8 +34,8 @@ private:
   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;
 };
 }
 

src/IceGlobalContext.cpp

@@ -35,8 +35,8 @@ namespace Ice {
 // 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 @@ private:
 
 // 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 @@ private:
 // 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() {}

src/IceGlobalContext.h

@@ -173,8 +173,8 @@ private:
   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 @@ private:
 // 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)

src/IceInst.h

@@ -165,13 +165,13 @@ protected:
   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 @@ public:
 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 @@ public:
 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 @@ public:
 
 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 @@ private:
   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 @@ protected:
 
 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 @@ public:
 
 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 @@ public:
 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 @@ public:
 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 @@ public:
 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 @@ public:
 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 @@ private:
       : 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 
 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 @@ public:
 
 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 @@ private:
 // 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; }

src/IceIntrinsics.h

@@ -159,8 +159,8 @@ private:
   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

src/IceLiveness.h

@@ -46,8 +46,8 @@ public:
 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 @@ private:
   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

src/IceOperand.h

@@ -86,8 +86,8 @@ protected:
   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 @@ protected:
   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 @@ public:
 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 @@ template <> inline void ConstantInteger64::dump(const Cfg *, Ostream &Str) const
 // 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 @@ private:
                       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 @@ public:
 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 @@ Ostream &operator<<(Ostream &Str, const LiveRange &L);
 // 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 @@ public:
   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 @@ private:
   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

src/IceRNG.h

@@ -27,9 +27,8 @@ public:
   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 @@ public:
   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;
 };

src/IceRegAlloc.h

@@ -43,8 +43,8 @@ public:
   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 @@ private:
   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

src/IceTargetLowering.h

@@ -86,8 +86,8 @@ private:
   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 @@ protected:
   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 @@ protected:
   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

src/IceTargetLoweringX8632.h

@@ -475,8 +475,8 @@ protected:
   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 @@ protected:
   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 {}
 };
 

src/IceTimerTree.h

@@ -38,8 +38,8 @@ public:
 };
 
 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);

src/IceTranslator.h

@@ -78,8 +78,8 @@ protected:
   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;
 };
 }
 

src/IceTypeConverter.h

@@ -28,8 +28,8 @@ namespace Ice {
 
 /// 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.

src/PNaClTranslator.cpp

@@ -51,8 +51,8 @@ static cl::opt<bool> AllowErrorRecovery(
 
 // 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 @@ void GlobalsParser::ProcessRecord() {
 
 /// 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 @@ class FunctionValuesymtabParser;
 
 /// 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 @@ void FunctionParser::ProcessRecord() {
 
 /// 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 @@ void ConstantsParser::ProcessRecord() {
 
 // 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 @@ private:
 };
 
 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)

src/PNaClTranslator.h

@@ -31,8 +31,8 @@ public:
   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;
 };
 }
 

src/assembler.h

@@ -64,8 +64,8 @@ private:
 
   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 @@ public:
 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

src/assembler_ia32.h

@@ -60,9 +60,8 @@ public:
 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 @@ private:
   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 @@ private:
 
   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) {