Fix incorrect merge conflict resolution and ClangFormat error

Signed-off-by: Elizabeth Andrews <[email protected]>

Author: elizabethandrews

clang/lib/Sema/SemaSYCL.cpp

@@ -1246,11 +1246,6 @@ class SyclKernelDeclCreator
     return true;
   }
 
-  // FIXME Remove this function when structs are replaced by their fields
-  bool handleStructType(FieldDecl *FD, QualType FieldTy) final {
-    return true;
-  }
-
   bool handleSyclHalfType(FieldDecl *FD, QualType FieldTy) final {
     addParam(FD, FieldTy);
     return true;
@@ -1568,11 +1563,6 @@ class SyclKernelBodyCreator
     return true;
   }
 
-  // FIXME Remove this function when structs are replaced by their fields
-  bool handleStructType(FieldDecl *FD, QualType FieldTy) final {
-    return true;
-  }
-
   bool handleScalarType(FieldDecl *FD, QualType FieldTy) final {
     if (dyn_cast<ArraySubscriptExpr>(MemberExprBases.back()))
       createExprForScalarElement(FD);
@@ -1581,8 +1571,6 @@ class SyclKernelBodyCreator
     return true;
   }
 
-  bool enterStruct(const CXXRecordDecl *, FieldDecl *FD) final {}
-
   bool enterStruct(const CXXRecordDecl *RD, const CXXBaseSpecifier &BS) final {
     CXXCastPath BasePath;
     QualType DerivedTy(RD->getTypeForDecl(), 0);
@@ -1594,6 +1582,7 @@ class SyclKernelBodyCreator
         SemaRef.Context, BaseTy, CK_DerivedToBase, MemberExprBases.back(),
         /* CXXCastPath=*/&BasePath, VK_LValue);
     MemberExprBases.push_back(Cast);
+    return true;
   }
 
   void addStructInit(const CXXRecordDecl *RD) {
@@ -1633,12 +1622,14 @@ class SyclKernelBodyCreator
           InitExprs.pop_back();
       }
     }
+    return true;
   }
 
   bool leaveStruct(const CXXRecordDecl *RD, const CXXBaseSpecifier &BS) final {
     const CXXRecordDecl *BaseClass = BS.getType()->getAsCXXRecordDecl();
     addStructInit(BaseClass);
     MemberExprBases.pop_back();
+    return true;
   }
 
   bool enterField(const CXXRecordDecl *RD, FieldDecl *FD) final {
@@ -1687,11 +1678,13 @@ class SyclKernelBodyCreator
 
   using SyclKernelFieldHandler::enterArray;
   using SyclKernelFieldHandler::enterField;
+  using SyclKernelFieldHandler::enterStruct;
   using SyclKernelFieldHandler::handleScalarType;
   using SyclKernelFieldHandler::handleSyclHalfType;
   using SyclKernelFieldHandler::handleSyclSamplerType;
   using SyclKernelFieldHandler::leaveArray;
   using SyclKernelFieldHandler::leaveField;
+  using SyclKernelFieldHandler::leaveStruct;
 };
 
 class SyclKernelIntHeaderCreator
@@ -1786,11 +1779,6 @@ class SyclKernelIntHeaderCreator
     return true;
   }
 
-  // FIXME Remove this function when structs are replaced by their fields
-  bool handleStructType(FieldDecl *FD, QualType FieldTy) final {
-    return true;
-  }
-
   bool handleScalarType(FieldDecl *FD, QualType FieldTy) final {
     addParam(FD, FieldTy, SYCLIntegrationHeader::kind_std_layout);
     return true;

clang/test/CodeGenSYCL/sampler.cpp

@@ -14,7 +14,7 @@
 
 // CHECK: define spir_kernel void @{{[a-zA-Z0-9_]+}}(%opencl.sampler_t addrspace(2)* [[SAMPLER_ARG_WRAPPED:%[a-zA-Z0-9_]+]], i32 [[ARG_A:%[a-zA-Z0-9_]+]])
 
-// Check alloca 
+// Check alloca
 // CHECK: [[SAMPLER_ARG_WRAPPED]].addr = alloca %opencl.sampler_t addrspace(2)*, align 8
 // CHECK: [[ARG_A]].addr = alloca i32, align 4
 // CHECK: [[LAMBDA:%[0-9]+]] = alloca %"class.{{.*}}.anon.0", align 8

sycl/test/basic_tests/accessor/accessor.cpp

@@ -513,10 +513,8 @@ int main() {
         sycl::buffer<int, 1> B(&cnst, sycl::range<1>(1));
         sycl::buffer<int, 1> C(&data, sycl::range<1>(1));
 
-
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
-
           sycl::accessor<int, 1, sycl::access::mode::write,
                          sycl::access::target::global_buffer>
               AccA(A, cgh);