Fix a pair of issues in stream/arrays of struct, add streams test that tests most array situations too.

Author: Erich Keane

clang/lib/Sema/SemaSYCL.cpp

@@ -2027,7 +2027,8 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
     const auto *StreamDecl = Ty->getAsCXXRecordDecl();
     CollectionInitExprs.push_back(CreateInitListExpr(StreamDecl));
 
-    MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
+    if (!IsArrayElement(FD, Ty))
+      MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
     return true;
   }
 
@@ -2036,8 +2037,6 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
     // Stream requires that its 'init' calls happen after its accessors init
     // calls, so add them here instead.
     const auto *StreamDecl = Ty->getAsCXXRecordDecl();
-    if (!IsArrayElement(FD, Ty))
-      MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
 
     createSpecialMethodCall(StreamDecl, InitMethodName, BodyStmts);
     createSpecialMethodCall(StreamDecl, FinalizeMethodName, FinalizeStmts);
@@ -2046,23 +2045,24 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
       MemberExprBases.pop_back();
 
     CollectionInitExprs.pop_back();
-    MemberExprBases.pop_back();
     return true;
   }
 
   bool enterStruct(const CXXRecordDecl *RD, FieldDecl *FD, QualType Ty) final {
     ++ContainerDepth;
     addCollectionInitListExpr(Ty->getAsCXXRecordDecl());
 
-    MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
+    if (!IsArrayElement(FD, Ty))
+      MemberExprBases.push_back(BuildMemberExpr(MemberExprBases.back(), FD));
     return true;
   }
 
   bool leaveStruct(const CXXRecordDecl *, FieldDecl *FD, QualType Ty) final {
     --ContainerDepth;
     CollectionInitExprs.pop_back();
 
-    MemberExprBases.pop_back();
+    if (!IsArrayElement(FD, Ty))
+      MemberExprBases.pop_back();
     return true;
   }
 

clang/test/SemaSYCL/Inputs/sycl.hpp

@@ -218,6 +218,18 @@ class handler {
   }
 };
 
+class stream {
+public:
+  stream(unsigned long BufferSize, unsigned long MaxStatementSize,
+         handler &CGH) {}
+
+  void __init() {}
+  void use() const {}
+
+  void __finalize() {}
+};
+
+
 namespace ONEAPI {
 namespace experimental {
 template <typename T, typename ID = T>