Original commit message: " Commit https://github.com/llvm/llvm-project/commit/46f3ade introduced a notion of printing the attributes on the left to improve the printing of attributes attached to variable declarations. The intent was to produce more GCC compatible code because clang tends to print the attributes on the right hand side which is not accepted by gcc. This approach has increased the complexity in tablegen and the attrubutes themselves as now the are supposed to know where they could appear. That lead to mishandling of the `override` keyword which is modelled as an attribute in clang. This patch takes an inspiration from the existing approach and tries to keep the position of the attributes as they were written. To do so we use simpler heuristic which checks if the source locations of the attribute precedes the declaration. If so, it is considered to be printed before the declaration. Fixes https://github.com/llvm/llvm-project/issues/87151 " The reason for the bot breakage is that attributes coming from ApiNotes are not marked implicit even though they do not have source locations. This caused an assert to trigger. This patch forces attributes with no source location information to be printed on the left. That change is consistent to the overall intent of the change to increase the chances for attributes to compile across toolchains and at the same time the produced code to be as close as possible to the one written by the user.
92 lines
2.9 KiB
C++
92 lines
2.9 KiB
C++
// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
|
|
// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
|
|
|
|
// RUN: %clang_cc1 -verify -fopenmp-simd -ast-print %s | FileCheck %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -emit-pch -o %t %s
|
|
// RUN: %clang_cc1 -fopenmp-simd -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s
|
|
// expected-no-diagnostics
|
|
|
|
// It is unclear if we want to annotate the template instantiations, e.g., S<int>::foo, or not in the two
|
|
// situations shown below. Since it is always fair to drop assumptions, we do that for now.
|
|
|
|
#ifndef HEADER
|
|
#define HEADER
|
|
|
|
template <typename T>
|
|
struct S {
|
|
int a;
|
|
// CHECK: template <typename T> struct S {
|
|
// CHECK: void foo() __attribute__((assume("ompx_global_assumption"))) {
|
|
void foo() {
|
|
#pragma omp parallel
|
|
{}
|
|
}
|
|
};
|
|
|
|
// CHECK: template<> struct S<int> {
|
|
// CHECK: void foo() __attribute__((assume("ompx_global_assumption"))) {
|
|
|
|
#pragma omp begin assumes no_openmp
|
|
// CHECK: __attribute__((assume("omp_no_openmp"))) void S_with_assumes_no_call() __attribute__((assume("ompx_global_assumption"))) {
|
|
void S_with_assumes_no_call() {
|
|
S<int> s;
|
|
s.a = 0;
|
|
}
|
|
// CHECK: __attribute__((assume("omp_no_openmp"))) void S_with_assumes_call() __attribute__((assume("ompx_global_assumption"))) {
|
|
void S_with_assumes_call() {
|
|
S<int> s;
|
|
s.a = 0;
|
|
// If this is executed we have UB!
|
|
s.foo();
|
|
}
|
|
#pragma omp end assumes
|
|
|
|
// CHECK: void S_without_assumes() __attribute__((assume("ompx_global_assumption"))) {
|
|
void S_without_assumes() {
|
|
S<int> s;
|
|
s.foo();
|
|
}
|
|
|
|
#pragma omp assumes ext_global_assumption
|
|
|
|
// Same as the struct S above but the order in which we instantiate P is different, first outside of an assumes.
|
|
template <typename T>
|
|
struct P {
|
|
// CHECK: template <typename T> struct P {
|
|
// CHECK: __attribute__((assume("ompx_global_assumption"))) void foo() {
|
|
int a;
|
|
void foo() {
|
|
#pragma omp parallel
|
|
{}
|
|
}
|
|
};
|
|
|
|
// TODO: Avoid the duplication here:
|
|
|
|
// CHECK: template<> struct P<int> {
|
|
// CHECK: __attribute__((assume("ompx_global_assumption"))) __attribute__((assume("ompx_global_assumption"))) void foo() {
|
|
|
|
// CHECK: __attribute__((assume("ompx_global_assumption"))) void P_without_assumes() {
|
|
void P_without_assumes() {
|
|
P<int> p;
|
|
p.foo();
|
|
}
|
|
|
|
#pragma omp begin assumes no_openmp
|
|
// CHECK: __attribute__((assume("omp_no_openmp"))) __attribute__((assume("ompx_global_assumption"))) void P_with_assumes_no_call() {
|
|
void P_with_assumes_no_call() {
|
|
P<int> p;
|
|
p.a = 0;
|
|
}
|
|
// CHECK: __attribute__((assume("omp_no_openmp"))) __attribute__((assume("ompx_global_assumption"))) void P_with_assumes_call() {
|
|
void P_with_assumes_call() {
|
|
P<int> p;
|
|
p.a = 0;
|
|
// If this is executed we have UB!
|
|
p.foo();
|
|
}
|
|
#pragma omp end assumes
|
|
|
|
#endif
|