Merge remote-tracking branch 'upstream/sycl' into sycl

Author: sarnex

.github/workflows/sycl-post-commit.yml

@@ -20,8 +20,11 @@ on:
     - ./devops/actions/cached_checkout
 
 concurrency:
-  #  Cancel a currently running workflow from the same PR or commit hash.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  # Cancel a currently running workflow from the same PR or commit hash.
+  # We need to use the user's branch name (which is in different variables
+  # for pull request events and push events) so that making a PR from a
+  # sycl-devops-pr branch doesn't cause two postcommit runs.
+  group: "${{ github.actor }}-${{ github.head_ref || github.ref_name }}"
   cancel-in-progress: true
 
 permissions: read-all

clang/lib/Sema/SemaAccess.cpp

@@ -301,6 +301,7 @@ static AccessResult IsDerivedFromInclusive(const CXXRecordDecl *Derived,
                                            const CXXRecordDecl *Target) {
   assert(Derived->getCanonicalDecl() == Derived);
   assert(Target->getCanonicalDecl() == Target);
+  assert(Derived->getDefinition() && "Expecting a complete type");
 
   if (Derived == Target) return AR_accessible;
 
@@ -776,6 +777,8 @@ static AccessResult HasAccess(Sema &S,
     // [B3] and [M3]
     } else {
       assert(Access == AS_protected);
+      if (!ECRecord->getDefinition())
+        continue;
       switch (IsDerivedFromInclusive(ECRecord, NamingClass)) {
       case AR_accessible: break;
       case AR_inaccessible: continue;

clang/test/SemaSYCL/attr-add-ir-attributes.cpp

@@ -991,3 +991,16 @@ struct __attribute__((sycl_special_class)) InvalidSpecialClassStruct32 {
 struct [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] InvalidKernelParameterSubjectStruct;     // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
 [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] void InvalidKernelParameterSubjectFunction() {} // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
 [[__sycl_detail__::add_ir_attributes_kernel_parameter("Attr1", 1)]] int InvalidKernelParameterSubjectVar;           // expected-error {{'add_ir_attributes_kernel_parameter' attribute only applies to parameters}}
+
+struct A {
+  protected:
+  static constexpr const char *ir_attribute_name = ""; // expected-note {{declared protected here}}
+  static constexpr auto ir_attribute_value = nullptr;  // expected-note {{declared protected here}}
+};
+
+template <typename Ts>
+struct [[__sycl_detail__::add_ir_attributes_global_variable(
+             Ts::ir_attribute_name, Ts::ir_attribute_value)]] B {  // expected-error {{'ir_attribute_name' is a protected member of 'A'}} // expected-error {{'ir_attribute_value' is a protected member of 'A'}}
+};
+
+B<A> v; // expected-note {{in instantiation of template class 'B<A>' requested here}}