More formatting and some bug fixing

Author: lbushi25

clang/lib/Sema/SemaSYCL.cpp

@@ -5053,6 +5053,7 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
   }
 
   bool leaveStruct(const CXXRecordDecl *, ParmVarDecl *, QualType) final {
+    Header.setParentStruct(nullptr);
     return true;
   }
 
@@ -7276,8 +7277,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
     for (ParmVarDecl *Param : K.SyclKernel->parameters()) {
       if (!Param->getType()->isStructureType())
         continue;
-      const RecordDecl *Struct =
-          Param->getType()->getAsRecordDecl();
+      const RecordDecl *Struct = Param->getType()->getAsRecordDecl();
       QualType type = Param->getType();
       if (!S.getStructsWithSpecialType().count(Struct) ||
           visitedStructWithSpecialType.count(Struct))
@@ -7408,8 +7408,16 @@ void SYCLIntegrationHeader::addParamDesc(kernel_param_kind_t Kind, int Info,
   PD.Kind = Kind;
   PD.Info = Info;
   PD.Offset = Offset;
-  OffsetSizeInfo[ParentStruct].emplace_back(std::make_pair(Offset, Info));
-  KindInfo[ParentStruct].emplace_back(Kind);
+  // If we are adding a free function kernel parameter that is a struct that
+  // contains a special type, a little more work needs to be done in order to
+  // help the runtime set the kernel arguments properly. Add the offset, size,
+  // and Kind information to the integration header for each field inside this
+  // struct. Also, verify that we are actually adding a field and not the struct
+  // itself by checking the Kind.
+  if (ParentStruct && Kind != kernel_param_kind_t::kind_struct_with_special_type) {
+    OffsetSizeInfo[ParentStruct].emplace_back(std::make_pair(Offset, Info));
+    KindInfo[ParentStruct].emplace_back(Kind);
+  }
 }
 
 void SYCLIntegrationHeader::setParentStruct(ParmVarDecl *parent) {

sycl/include/sycl/handler.hpp

@@ -3750,6 +3750,7 @@ class __SYCL_EXPORT handler {
   queue getQueue();
 
   void incrementArgShift(int Shift);
+
 protected:
   /// Registers event dependencies in this command group.
   void depends_on(const detail::EventImplPtr &Event);

sycl/source/detail/handler_impl.hpp

@@ -63,7 +63,7 @@ class handler_impl {
 
   KernelNameStrRefT getKernelName() const {
     return MKernelData.getKernelName();
-  } 
+  }
 
   /// Registers mutually exclusive submission states.
   HandlerSubmissionState MSubmissionState = HandlerSubmissionState::NO_STATE;

sycl/source/detail/kernel_data.cpp

@@ -282,6 +282,7 @@ void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
   }
 }
 
+
 void KernelData::extractArgsAndReqs(bool IsKernelCreatedFromSource) {
   std::vector<detail::ArgDesc> UnPreparedArgs = std::move(MArgs);
   clearArgs();