5 files changed, 12 insertions, 7 deletions
diff --git a/lib/CodeGen/ABIInfo.h b/lib/CodeGen/ABIInfo.h
index 259b6142bf..76aeec0f04 100644
--- a/lib/CodeGen/ABIInfo.h
+++ b/lib/CodeGen/ABIInfo.h
@@ -110,6 +110,7 @@ public:
 /// passed or returned from functions.
 class ABIInfo {
 public:
+  virtual ~ABIInfo() {}
   virtual void computeReturnTypeInfo(QualType T, ABIRetInfo &Info) const = 0;
 };
 
diff --git a/lib/CodeGen/CGABI.h b/lib/CodeGen/CGABI.h
index ea5e7b7d40..81fe852ec2 100644
--- a/lib/CodeGen/CGABI.h
+++ b/lib/CodeGen/CGABI.h
@@ -17,18 +17,21 @@ namespace CodeGen {
 
 class FortranABI {
 public:
+  virtual ~FortranABI() {}
   virtual ABIArgInfo GetArgABI(QualType ArgType);
   virtual ABIRetInfo GetRetABI(QualType RetType);
 };
 
 class LibflangABI : public FortranABI {
 public:
+  virtual ~LibflangABI() {}
   ABIArgInfo GetArgABI(QualType ArgType);
   ABIRetInfo GetRetABI(QualType RetType);
 };
 
 class LibflangTransferABI : public LibflangABI {
 public:
+  virtual ~LibflangTransferABI() {}
   ABIArgInfo GetArgABI(QualType ArgType);
 };
 
diff --git a/lib/CodeGen/CGValue.h b/lib/CodeGen/CGValue.h
index f995ecb89e..f937dbf435 100644
--- a/lib/CodeGen/CGValue.h
+++ b/lib/CodeGen/CGValue.h
@@ -138,16 +138,16 @@ private:
   llvm::Value *V2;
 
   RValueTy(llvm::Value *V, Kind Type)
-    : V1(V), ValueType(Type) {}
+    : ValueType(Type), V1(V) {}
 public:
 
   RValueTy() : ValueType(None) {}
   RValueTy(llvm::Value *V)
-    : V1(V), ValueType(Scalar) {}
+    : ValueType(Scalar), V1(V) {}
   RValueTy(ComplexValueTy C)
-    : V1(C.Re), V2(C.Im), ValueType(Complex) {}
+    : ValueType(Complex), V1(C.Re), V2(C.Im) {}
   RValueTy(CharacterValueTy CharValue)
-    : V1(CharValue.Ptr), V2(CharValue.Len), ValueType(Character) {}
+    : ValueType(Character), V1(CharValue.Ptr), V2(CharValue.Len) {}
 
   Kind getType() const {
     return ValueType;
diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index e19b7edc7e..e3c0121c1c 100644
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -67,6 +67,8 @@ llvm::Type *CodeGenTypes::ConvertBuiltInType(BuiltinType::TypeSpec Spec,
                                              BuiltinType::TypeKind Kind) {
   llvm::Type *Type;
   switch(Kind) {
+  default:
+    break;
   case BuiltinType::Int1:
     return CGM.Int8Ty;
   case BuiltinType::Int2:
diff --git a/lib/CodeGen/ModuleBuilder.cpp b/lib/CodeGen/ModuleBuilder.cpp
index ba87058e91..f70c56aea8 100644
--- a/lib/CodeGen/ModuleBuilder.cpp
+++ b/lib/CodeGen/ModuleBuilder.cpp
@@ -42,9 +42,8 @@ namespace {
                       const CodeGenOptions &CGO,
                       const TargetOptions &TO,
                       llvm::LLVMContext& C)
-      : Diags(diags), CodeGenOpts(CGO),
-        M(new llvm::Module(ModuleName, C)),
-        Target(TO) {}
+      : Diags(diags), CodeGenOpts(CGO), Target(TO),
+        M(new llvm::Module(ModuleName, C)) {}
 
     virtual ~CodeGeneratorImpl() {}