diff --git a/lib/HLSL/HLOperationLower.cpp b/lib/HLSL/HLOperationLower.cpp
index 2e8afc76..9e7e7a90 100644
--- a/lib/HLSL/HLOperationLower.cpp
+++ b/lib/HLSL/HLOperationLower.cpp
@@ -4878,7 +4878,7 @@ Value *ClampTessFactor(Value *input,
     DXASSERT(partitionMode == DXIL::TessellatorPartitioning::FractionalEven,
              "invalid partition mode");
     fMin = kTESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR;
-      fMax = kTESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR;
+    fMax = kTESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR;
     break;
   }
   Type *f32Ty = input->getType()->getScalarType();
@@ -5005,10 +5005,10 @@ Value *ApplyTriTessFactorOp(Value *input, DXIL::OpCode opcode, hlsl::OP *hlslOP,
     return combined;
   } else {
     // Avg.
-      Value *temp = Builder.CreateFAdd(input0, input1);
+    Value *temp = Builder.CreateFAdd(input0, input1);
     Value *combined = Builder.CreateFAdd(temp, input2);
     Value *rcp = ConstantFP::get(input0->getType(), 1.0 / 3.0);
-      combined = Builder.CreateFMul(combined, rcp);
+    combined = Builder.CreateFMul(combined, rcp);
     return combined;
   }
 }
@@ -5059,7 +5059,7 @@ Value *Apply2DQuadTessFactorOp(Value *input, DXIL::OpCode opcode,
     return combined;
   } else {
     // Avg.
-      Value *temp0 = Builder.CreateFAdd(input0, input1);
+    Value *temp0 = Builder.CreateFAdd(input0, input1);
     Value *temp1 = Builder.CreateFAdd(input2, input3);
     Value *combined = UndefValue::get(VectorType::get(input0->getType(), 2));
     combined = Builder.CreateInsertElement(combined, temp0, (uint64_t)0);
diff --git a/tools/clang/lib/CodeGen/CGHLSLMS.cpp b/tools/clang/lib/CodeGen/CGHLSLMS.cpp
index 2c6f2637..91d5c86d 100644
--- a/tools/clang/lib/CodeGen/CGHLSLMS.cpp
+++ b/tools/clang/lib/CodeGen/CGHLSLMS.cpp
@@ -5503,14 +5503,14 @@ static bool AreMatrixArrayOrientationMatching(ASTContext &Context,
                                               HLModule &Module, QualType LhsTy,
                                               QualType RhsTy) {
   while (const clang::ArrayType *LhsArrayTy = Context.getAsArrayType(LhsTy)) {
-      LhsTy = LhsArrayTy->getElementType();
-      RhsTy = Context.getAsArrayType(RhsTy)->getElementType();
+    LhsTy = LhsArrayTy->getElementType();
+    RhsTy = Context.getAsArrayType(RhsTy)->getElementType();
   }
 
   bool LhsRowMajor, RhsRowMajor;
   LhsRowMajor = RhsRowMajor = Module.GetHLOptions().bDefaultRowMajor;
   HasHLSLMatOrientation(LhsTy, &LhsRowMajor);
-    HasHLSLMatOrientation(RhsTy, &RhsRowMajor);
+  HasHLSLMatOrientation(RhsTy, &RhsRowMajor);
   return LhsRowMajor == RhsRowMajor;
 }
 
@@ -5542,7 +5542,7 @@ void CGMSHLSLRuntime::EmitHLSLAggregateCopy(
         IntegerType::get(Ty->getContext(), 32), APInt(32, 0));
     idxList.emplace_back(idx);
 
-      EmitHLSLAggregateCopy(CGF, SrcPtr, DestPtr, idxList, SrcType, DestType,
+    EmitHLSLAggregateCopy(CGF, SrcPtr, DestPtr, idxList, SrcType, DestType,
                           PT->getElementType());
 
     idxList.pop_back();