diff --git a/llvm/include/llvm/ADT/FoldingSet.h b/llvm/include/llvm/ADT/FoldingSet.h
index e6ded76f260d..d88a814242c5 100644
--- a/llvm/include/llvm/ADT/FoldingSet.h
+++ b/llvm/include/llvm/ADT/FoldingSet.h
@@ -119,7 +119,7 @@ private:
   unsigned NumNodes;
   
 public:
-  FoldingSetImpl(unsigned Log2InitSize = 6);
+  explicit FoldingSetImpl(unsigned Log2InitSize = 6);
   virtual ~FoldingSetImpl();
   
   // Forward declaration.
@@ -232,7 +232,7 @@ private:
   }
   
 public:
-  FoldingSet(unsigned Log2InitSize = 6)
+  explicit FoldingSet(unsigned Log2InitSize = 6)
   : FoldingSetImpl(Log2InitSize)
   {}
 
diff --git a/llvm/include/llvm/CodeGen/LiveInterval.h b/llvm/include/llvm/CodeGen/LiveInterval.h
index 99933eaa9506..281e3af96c21 100644
--- a/llvm/include/llvm/CodeGen/LiveInterval.h
+++ b/llvm/include/llvm/CodeGen/LiveInterval.h
@@ -96,8 +96,8 @@ namespace llvm {
       unsigned def;
       unsigned reg;
       SmallVector<unsigned, 4> kills;
-      VNInfo() : def(~1U), reg(0) {};
-      VNInfo(unsigned d, unsigned r) : def(d), reg(r) {};
+      VNInfo() : def(~1U), reg(0) {}
+      VNInfo(unsigned d, unsigned r) : def(d), reg(r) {}
     };
   private:
     SmallVector<VNInfo, 4> ValueNumberInfo;
diff --git a/llvm/include/llvm/CodeGen/MachineConstantPool.h b/llvm/include/llvm/CodeGen/MachineConstantPool.h
index ec00fc115d1d..f05a540d38e5 100644
--- a/llvm/include/llvm/CodeGen/MachineConstantPool.h
+++ b/llvm/include/llvm/CodeGen/MachineConstantPool.h
@@ -36,7 +36,7 @@ class MachineConstantPoolValue {
 
 public:
   explicit MachineConstantPoolValue(const Type *ty) : Ty(ty) {}
-  virtual ~MachineConstantPoolValue() {};
+  virtual ~MachineConstantPoolValue() {}
 
   /// getType - get type of this MachineConstantPoolValue.
   ///
diff --git a/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h
index 00a1fe884071..3c79b944f50d 100644
--- a/llvm/include/llvm/CodeGen/MachineFunction.h
+++ b/llvm/include/llvm/CodeGen/MachineFunction.h
@@ -73,7 +73,7 @@ public:
 /// of type are accessed/created with MF::getInfo and destroyed when the
 /// MachineFunction is destroyed.
 struct MachineFunctionInfo {
-  virtual ~MachineFunctionInfo() {};
+  virtual ~MachineFunctionInfo() {}
 };
 
 class MachineFunction : private Annotation {
diff --git a/llvm/include/llvm/CodeGen/RegisterScavenging.h b/llvm/include/llvm/CodeGen/RegisterScavenging.h
index ec23e760fa2c..aba57dc5fc4f 100644
--- a/llvm/include/llvm/CodeGen/RegisterScavenging.h
+++ b/llvm/include/llvm/CodeGen/RegisterScavenging.h
@@ -55,11 +55,11 @@ class RegScavenger {
 public:
   RegScavenger()
     : MBB(NULL), NumPhysRegs(0), Tracking(false),
-      ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {};
+      ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {}
 
   explicit RegScavenger(MachineBasicBlock *mbb)
     : MBB(mbb), NumPhysRegs(0), Tracking(false),
-      ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {};
+      ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {}
 
   /// enterBasicBlock - Start tracking liveness from the begin of the specific
   /// basic block.
diff --git a/llvm/include/llvm/CodeGen/SelectionDAGISel.h b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
index 047da7c92d94..de7548596eaf 100644
--- a/llvm/include/llvm/CodeGen/SelectionDAGISel.h
+++ b/llvm/include/llvm/CodeGen/SelectionDAGISel.h
@@ -104,7 +104,7 @@ public:
   };
   struct JumpTable {
     JumpTable(unsigned R, unsigned J, MachineBasicBlock *M,
-              MachineBasicBlock *D): Reg(R), JTI(J), MBB(M), Default(D) {};
+              MachineBasicBlock *D): Reg(R), JTI(J), MBB(M), Default(D) {}
     
     /// Reg - the virtual register containing the index of the jump table entry
     //. to jump to.
@@ -120,7 +120,7 @@ public:
   struct JumpTableHeader {
     JumpTableHeader(uint64_t F, uint64_t L, Value* SV, MachineBasicBlock* H,
                     bool E = false):
-      First(F), Last(L), SValue(SV), HeaderBB(H), Emitted(E) {};
+      First(F), Last(L), SValue(SV), HeaderBB(H), Emitted(E) {}
     uint64_t First;
     uint64_t Last;
     Value *SValue;
@@ -131,7 +131,7 @@ public:
 
   struct BitTestCase {
     BitTestCase(uint64_t M, MachineBasicBlock* T, MachineBasicBlock* Tr):
-      Mask(M), ThisBB(T), TargetBB(Tr) { };
+      Mask(M), ThisBB(T), TargetBB(Tr) { }
     uint64_t Mask;
     MachineBasicBlock* ThisBB;
     MachineBasicBlock* TargetBB;
@@ -145,7 +145,7 @@ public:
                  MachineBasicBlock* P, MachineBasicBlock* D,
                  const BitTestInfo& C):
       First(F), Range(R), SValue(SV), Reg(Rg), Emitted(E),
-      Parent(P), Default(D), Cases(C) { };
+      Parent(P), Default(D), Cases(C) { }
     uint64_t First;
     uint64_t Range;
     Value  *SValue;
diff --git a/llvm/include/llvm/CodeGen/SimpleRegisterCoalescing.h b/llvm/include/llvm/CodeGen/SimpleRegisterCoalescing.h
index 20bcb89d9a8a..892ab4873a6c 100644
--- a/llvm/include/llvm/CodeGen/SimpleRegisterCoalescing.h
+++ b/llvm/include/llvm/CodeGen/SimpleRegisterCoalescing.h
@@ -47,7 +47,7 @@ namespace llvm {
 
   public:
     static char ID; // Pass identifcation, replacement for typeid
-    SimpleRegisterCoalescing() : MachineFunctionPass((intptr_t)&ID) {};
+    SimpleRegisterCoalescing() : MachineFunctionPass((intptr_t)&ID) {}
 
     struct CopyRec {
       MachineInstr *MI;
diff --git a/llvm/include/llvm/Support/FileUtilities.h b/llvm/include/llvm/Support/FileUtilities.h
index 9cebe2386237..950516d1a421 100644
--- a/llvm/include/llvm/Support/FileUtilities.h
+++ b/llvm/include/llvm/Support/FileUtilities.h
@@ -40,7 +40,7 @@ namespace llvm {
     sys::Path Filename;
     bool DeleteIt;
   public:
-    FileRemover(const sys::Path &filename, bool deleteIt = true)
+    explicit FileRemover(const sys::Path &filename, bool deleteIt = true)
       : Filename(filename), DeleteIt(deleteIt) {}
 
     ~FileRemover() {
diff --git a/llvm/include/llvm/Target/TargetELFWriterInfo.h b/llvm/include/llvm/Target/TargetELFWriterInfo.h
index a8332dfd8d27..ba44f4adba84 100644
--- a/llvm/include/llvm/Target/TargetELFWriterInfo.h
+++ b/llvm/include/llvm/Target/TargetELFWriterInfo.h
@@ -32,7 +32,7 @@ namespace llvm {
       EM_386 = 3
     };
 
-    TargetELFWriterInfo(MachineType machine) : EMachine(machine) {}
+    explicit TargetELFWriterInfo(MachineType machine) : EMachine(machine) {}
     virtual ~TargetELFWriterInfo() {}
 
     unsigned short getEMachine() const { return EMachine; }
diff --git a/llvm/include/llvm/Target/TargetLowering.h b/llvm/include/llvm/Target/TargetLowering.h
index f566038e4c4f..ed97a93b44ba 100644
--- a/llvm/include/llvm/Target/TargetLowering.h
+++ b/llvm/include/llvm/Target/TargetLowering.h
@@ -844,7 +844,7 @@ public:
     bool isByVal;
 
     ArgListEntry() : isSExt(false), isZExt(false), isInReg(false),
-      isSRet(false), isNest(false), isByVal(false) { };
+      isSRet(false), isNest(false), isByVal(false) { }
   };
   typedef std::vector<ArgListEntry> ArgListTy;
   virtual std::pair<SDOperand, SDOperand>
diff --git a/llvm/lib/CodeGen/DwarfWriter.cpp b/llvm/lib/CodeGen/DwarfWriter.cpp
index 19aa6c3b9309..959170bd0c00 100644
--- a/llvm/lib/CodeGen/DwarfWriter.cpp
+++ b/llvm/lib/CodeGen/DwarfWriter.cpp
@@ -221,7 +221,7 @@ protected:
   std::vector<DIEValue *> Values;
   
 public:
-  DIE(unsigned Tag)
+  explicit DIE(unsigned Tag)
   : Abbrev(Tag, DW_CHILDREN_no)
   , Offset(0)
   , Size(0)
@@ -304,7 +304,7 @@ public:
   ///
   unsigned Type;
   
-  DIEValue(unsigned T)
+  explicit DIEValue(unsigned T)
   : Type(T)
   {}
   virtual ~DIEValue() {}
@@ -344,7 +344,7 @@ private:
   uint64_t Integer;
   
 public:
-  DIEInteger(uint64_t I) : DIEValue(isInteger), Integer(I) {}
+  explicit DIEInteger(uint64_t I) : DIEValue(isInteger), Integer(I) {}
 
   // Implement isa/cast/dyncast.
   static bool classof(const DIEInteger *) { return true; }
@@ -396,7 +396,7 @@ class DIEString : public DIEValue {
 public:
   const std::string String;
   
-  DIEString(const std::string &S) : DIEValue(isString), String(S) {}
+  explicit DIEString(const std::string &S) : DIEValue(isString), String(S) {}
 
   // Implement isa/cast/dyncast.
   static bool classof(const DIEString *) { return true; }
@@ -435,7 +435,7 @@ public:
 
   const DWLabel Label;
   
-  DIEDwarfLabel(const DWLabel &L) : DIEValue(isLabel), Label(L) {}
+  explicit DIEDwarfLabel(const DWLabel &L) : DIEValue(isLabel), Label(L) {}
 
   // Implement isa/cast/dyncast.
   static bool classof(const DIEDwarfLabel *)  { return true; }
@@ -473,7 +473,8 @@ class DIEObjectLabel : public DIEValue {
 public:
   const std::string Label;
   
-  DIEObjectLabel(const std::string &L) : DIEValue(isAsIsLabel), Label(L) {}
+  explicit DIEObjectLabel(const std::string &L)
+  : DIEValue(isAsIsLabel), Label(L) {}
 
   // Implement isa/cast/dyncast.
   static bool classof(const DIEObjectLabel *) { return true; }
@@ -553,7 +554,7 @@ class DIEntry : public DIEValue {
 public:
   DIE *Entry;
   
-  DIEntry(DIE *E) : DIEValue(isEntry), Entry(E) {}
+  explicit DIEntry(DIE *E) : DIEValue(isEntry), Entry(E) {}
   
   // Implement isa/cast/dyncast.
   static bool classof(const DIEntry *)   { return true; }
@@ -1117,7 +1118,7 @@ private:
     std::vector<MachineMove> Moves;
 
     FunctionDebugFrameInfo(unsigned Num, const std::vector<MachineMove> &M):
-      Number(Num), Moves(M) { };
+      Number(Num), Moves(M) { }
   };
 
   std::vector<FunctionDebugFrameInfo> DebugFrames;
@@ -2745,7 +2746,7 @@ private:
                         bool hC, bool hL,
                         const std::vector<MachineMove> &M):
       FnName(FN), Number(Num), PersonalityIndex(P),
-      hasCalls(hC), hasLandingPads(hL), Moves(M) { };
+      hasCalls(hC), hasLandingPads(hL), Moves(M) { }
   };
 
   std::vector<FunctionEHFrameInfo> EHFrames;
diff --git a/llvm/lib/CodeGen/PhysRegTracker.h b/llvm/lib/CodeGen/PhysRegTracker.h
index f5a240231cf2..2717e337687a 100644
--- a/llvm/lib/CodeGen/PhysRegTracker.h
+++ b/llvm/lib/CodeGen/PhysRegTracker.h
@@ -26,7 +26,7 @@ namespace llvm {
         std::vector<unsigned> regUse_;
 
     public:
-        PhysRegTracker(const MRegisterInfo& mri)
+        explicit PhysRegTracker(const MRegisterInfo& mri)
             : mri_(&mri),
               regUse_(mri_->getNumRegs(), 0) {
         }