diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 73c4bae7dbdb3b85ae1e59ae24f67915cbf668fe..0a49ea5a5e96edac84b133ac5c0bde63b1a878c8 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1298,7 +1298,7 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) {
     Value *Src = Visit(const_cast<Expr*>(E));
     llvm::Type *SrcTy = Src->getType();
     llvm::Type *DstTy = ConvertType(DestTy);
-    if (SrcTy->isPtrOrPtrVectorTy() && DstTy->isPtrOrPtrVectorTy() && 
+    if (SrcTy->isPtrOrPtrVectorTy() && DstTy->isPtrOrPtrVectorTy() &&
         SrcTy->getPointerAddressSpace() != DstTy->getPointerAddressSpace()) {
       llvm::Type *MidTy = CGF.CGM.getDataLayout().getIntPtrType(SrcTy);
       return Builder.CreateIntToPtr(Builder.CreatePtrToInt(Src, MidTy), DstTy);
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 4b3aa1abf369fdd510295e3cdc0e50215b4b941c..715af365c382c37dd8b22e2bb0152df3aa1a233e 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -394,7 +394,7 @@ static void GenOpenCLArgMetadata(const FunctionDecl *FD, llvm::Function *Fn,
       if (ty->isImageType())
         AddrSpc =
           CGM.getContext().getTargetAddressSpace(LangAS::opencl_global);
-      
+
       addressQuals.push_back(Builder.getInt32(AddrSpc));
 
       // Get argument type name.
diff --git a/lib/CodeGen/CodeGenPGO.cpp b/lib/CodeGen/CodeGenPGO.cpp
index 5475342ecddf2c99f705f3919131cfda37341ea4..f81cbecd5d31ee03dcb27bcd63457a824c906bab 100644
--- a/lib/CodeGen/CodeGenPGO.cpp
+++ b/lib/CodeGen/CodeGenPGO.cpp
@@ -480,8 +480,7 @@ llvm::MDNode *CodeGenPGO::createBranchWeights(uint64_t TrueCount,
   return MDHelper.createBranchWeights(TrueCount + 1, FalseCount + 1);
 }
 
-llvm::MDNode *
-CodeGenPGO::createBranchWeights(ArrayRef<uint64_t> Weights) {
+llvm::MDNode *CodeGenPGO::createBranchWeights(ArrayRef<uint64_t> Weights) {
   llvm::MDBuilder MDHelper(CGM.getLLVMContext());
   // TODO: need to scale down to 32-bits, instead of just truncating.
   // According to Laplace's Rule of Succession, it is better to compute the