Handle another case of conflicting attributes for redeclarations

- throw error when same attributes with different parameters are
applied
- add test case

Author: schittir

clang/lib/Sema/SemaDecl.cpp

@@ -3291,6 +3291,21 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD,
     }
   }
 
+  if (New->hasAttr<ReqdWorkGroupSizeAttr>() &&
+      Old->hasAttr<ReqdWorkGroupSizeAttr>()) {
+    auto *NewDeclAttr = New->getAttr<ReqdWorkGroupSizeAttr>();
+    auto *OldDeclAttr = Old->getAttr<ReqdWorkGroupSizeAttr>();
+    if ((NewDeclAttr->getXDim() != OldDeclAttr->getXDim()) ||
+        (NewDeclAttr->getYDim() != OldDeclAttr->getYDim()) ||
+        (NewDeclAttr->getZDim() != OldDeclAttr->getZDim())) {
+      Diag(New->getLocation(), diag::err_conflicting_sycl_function_attributes)
+          << OldDeclAttr << NewDeclAttr;
+      Diag(New->getLocation(), diag::warn_duplicate_attribute) << OldDeclAttr;
+      Diag(OldDeclAttr->getLocation(), diag::note_conflicting_attribute);
+      Diag(NewDeclAttr->getLocation(), diag::note_conflicting_attribute);
+    }
+  }
+
   if (New->hasAttr<InternalLinkageAttr>() &&
       !Old->hasAttr<InternalLinkageAttr>()) {
     Diag(New->getLocation(), diag::err_internal_linkage_redeclaration)

clang/test/SemaSYCL/redeclaration-attribute-propagation.cpp

@@ -3,6 +3,7 @@
 // RUN: %clang_cc1 %s -fsyntax-only -ast-dump -fsycl -fsycl-is-device -triple spir64 | FileCheck %s
 
 #ifndef TRIGGER_ERROR
+//first case - good case
 [[intelfpga::no_global_work_offset]] // expected-no-diagnostics
 void
 func1();
@@ -12,13 +13,24 @@ func1();
 [[cl::reqd_work_group_size(2, 2, 2)]] void func1() {}
 
 #else
-[[intelfpga::max_work_group_size(4, 4, 4)]] // expected-note {{conflicting attribute is here}}
-void
+//second case - expect error
+[[intelfpga::max_work_group_size(4, 4, 4)]] void
 func2();
 
 [[cl::reqd_work_group_size(8, 8, 8)]] // expected-note {{conflicting attribute is here}}
 void
 func2() {}
+
+//third case - expect error
+[[cl::reqd_work_group_size(4, 4, 4)]] // expected-note {{conflicting attribute is here}}
+void
+func3();
+
+[[cl::reqd_work_group_size(1, 1, 1)]] // expected-note 2 {{conflicting attribute is here}}
+void
+// expected-warning@+1 {{attribute 'reqd_work_group_size' is already applied with different parameters}}
+func3() {} // expected-error {{'reqd_work_group_size' attribute conflicts with ''reqd_work_group_size'' attribute}}
+
 #endif
 
 template <typename Name, typename Type>
@@ -28,6 +40,7 @@ template <typename Name, typename Type>
   func1();
 #else
   func2();
+  func3();
 #endif
 }