fix merge & clang-format

Author: hekota

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

@@ -662,8 +662,8 @@ BuiltinTypeDeclBuilder::addHandleConstructorFromBinding() {
       .addParam("spaceNo", AST.UnsignedIntTy)
       .addParam("range", AST.IntTy)
       .addParam("index", AST.UnsignedIntTy)
-      .callBuiltin("__builtin_hlsl_resource_handlefrombinding",
-                   HandleType, PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
+      .callBuiltin("__builtin_hlsl_resource_handlefrombinding", HandleType,
+                   PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
       .assign(PH::Handle, PH::LastStmt)
       .finalize();
 }

clang/test/AST/HLSL/StructuredBuffers-AST.hlsl

@@ -166,8 +166,6 @@ RESOURCE<float> Buffer;
 
 // Load method
 
-// Load method
-
 // CHECK-LOAD: CXXMethodDecl {{.*}} Load 'element_type (unsigned int)'
 // CHECK-LOAD-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
 // CHECK-LOAD-NEXT: CompoundStmt