Skip to content

Commit bb51852

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:cbbcc3d13b77 into origin/amd-gfx:57c5dec448e2
Local branch origin/amd-gfx 57c5dec Merged main:4acfeafd8fa4 into origin/amd-gfx:fdf59f627ff1 Remote branch main cbbcc3d [C2y] Claim conformance to WG14 N3460 (llvm#131196)
2 parents 57c5dec + cbbcc3d commit bb51852

File tree

503 files changed

+8728
-9371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

503 files changed

+8728
-9371
lines changed

‎clang/docs/ReleaseNotes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ Bug Fixes to C++ Support
310310
- Clang now correctly parses ``if constexpr`` expressions in immediate function context. (#GH123524)
311311
- Fixed an assertion failure affecting code that uses C++23 "deducing this". (#GH130272)
312312
- Clang now properly instantiates destructors for initialized members within non-delegating constructors. (#GH93251)
313+
- Correctly diagnoses if unresolved using declarations shadows template paramters (#GH129411)
313314

314315
Bug Fixes to AST Handling
315316
^^^^^^^^^^^^^^^^^^^^^^^^^

‎clang/lib/Driver/Driver.cpp

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,23 +1040,15 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
10401040
// We need to temporarily create these toolchains so that we can access
10411041
// tools for inferring architectures.
10421042
llvm::DenseSet<StringRef> Archs;
1043-
if (NVPTXTriple) {
1044-
auto TempTC = std::make_unique<toolchains::CudaToolChain>(
1045-
*this, *NVPTXTriple, *HostTC, C.getInputArgs());
1046-
for (StringRef Arch : getOffloadArchs(
1047-
C, C.getArgs(), Action::OFK_OpenMP, &*TempTC, true))
1048-
Archs.insert(Arch);
1049-
}
1050-
if (AMDTriple) {
1051-
auto TempTC = std::make_unique<toolchains::AMDGPUOpenMPToolChain>(
1052-
*this, *AMDTriple, *HostTC, C.getInputArgs());
1053-
for (StringRef Arch : getOffloadArchs(
1054-
C, C.getArgs(), Action::OFK_OpenMP, &*TempTC, true))
1055-
Archs.insert(Arch);
1056-
}
1057-
if (!AMDTriple && !NVPTXTriple) {
1043+
for (const std::optional<llvm::Triple> &TT : {NVPTXTriple, AMDTriple}) {
1044+
if (!TT)
1045+
continue;
1046+
1047+
auto &TC =
1048+
getOffloadToolChain(C.getInputArgs(), Action::OFK_OpenMP, *TT,
1049+
C.getDefaultToolChain().getTriple());
10581050
for (StringRef Arch :
1059-
getOffloadArchs(C, C.getArgs(), Action::OFK_OpenMP, nullptr, true))
1051+
getOffloadArchs(C, C.getArgs(), Action::OFK_OpenMP, &TC, true))
10601052
Archs.insert(Arch);
10611053
}
10621054

‎clang/lib/Sema/SemaDeclCXX.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12895,6 +12895,10 @@ NamedDecl *Sema::BuildUsingDeclaration(
1289512895
SS, NameInfo, IdentLoc))
1289612896
return nullptr;
1289712897

12898+
if (Previous.isSingleResult() &&
12899+
Previous.getFoundDecl()->isTemplateParameter())
12900+
DiagnoseTemplateParameterShadow(IdentLoc, Previous.getFoundDecl());
12901+
1289812902
if (HasTypenameKeyword) {
1289912903
// FIXME: not all declaration name kinds are legal here
1290012904
D = UnresolvedUsingTypenameDecl::Create(Context, CurContext,

‎clang/test/C/C2y/n3460.c

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// RUN: %clang_cc1 -verify -std=c2y -Wall %s
2+
3+
/* WG14 N3460: Clang 12
4+
* Complex operators
5+
*
6+
* This moves some Annex G requirements into the main body of the standard.
7+
*/
8+
9+
// CMPLX(0.0, inf) * 2.0, the result should be CMPLX(0.0, inf), not CMPLX(nan, inf)
10+
static_assert(__builtin_complex(0.0, __builtin_inf()) * 2.0 ==
11+
__builtin_complex(0.0, __builtin_inf()));
12+
13+
// CMPLX(0.0, 1.0) * -0.0 is CMPLX(-0.0, -0.0), not CMPLX(-0.0, +0.0)
14+
static_assert(__builtin_complex(0.0, 1.0) * -0.0 ==
15+
__builtin_complex(-0.0, -0.0));
16+
17+
// Testing for -0.0 is a pain because -0.0 == +0.0, so forcefully generate a
18+
// diagnostic and check the note.
19+
static_assert(__builtin_complex(0.0, 1.0) * -0.0 == 1); /* expected-error {{static assertion failed due to requirement '__builtin_complex(0., 1.) * -0. == 1'}} \
20+
expected-note {{expression evaluates to '(-0 + -0i) == 1'}}
21+
*/
22+
23+
// CMPLX(0.0, inf) / 2.0, the result should be CMPLX(0.0, inf),
24+
// not CMPLX(nan, inf)
25+
static_assert(__builtin_complex(0.0, __builtin_inf()) / 2.0 ==
26+
__builtin_complex(0.0, __builtin_inf()));
27+
28+
// CMPLX(2.0, 3.0) * 2.0, the result should be CMPLX(4.0, 6.0)
29+
static_assert(__builtin_complex(2.0, 3.0) * 2.0 ==
30+
__builtin_complex(4.0, 6.0));
31+
32+
// CMPLX(2.0, 4.0) / 2.0, the result should be CMPLX(1.0, 2.0)
33+
static_assert(__builtin_complex(2.0, 4.0) / 2.0 ==
34+
__builtin_complex(1.0, 2.0));
35+
36+
// CMPLX(2.0, 3.0) * CMPLX(4.0, 5.0), the result should be
37+
// CMPLX(8.0 - 15.0, 12.0 + 10.0)
38+
static_assert(__builtin_complex(2.0, 3.0) * __builtin_complex(4.0, 5.0) ==
39+
__builtin_complex(-7.0, 22.0));
40+
41+
// CMPLX(2.0, 3.0) / CMPLX(4.0, 5.0), the result should be
42+
// CMPLX((8.0 + 15.0)/(4.0^2 + 5.0^2), (12.0 - 10.0)/(4.0^2 + 5.0^2))
43+
static_assert(__builtin_complex(2.0, 3.0) / __builtin_complex(4.0, 5.0) ==
44+
__builtin_complex(23.0 / 41.0, 2.0 / 41.0));
45+
46+
47+
// 2.0 / CMPLX(2.0, 4.0), the result should be
48+
// CMPLX(4.0 /(2.0^2 + 4.0^2), -8.0/(2.0^2 + 4.0^2))
49+
static_assert(2.0 / __builtin_complex(2.0, 4.0) ==
50+
__builtin_complex(4.0 / 20.0, -8.0 / 20.0));
51+

‎clang/test/C/C2y/n3460_1.c

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
2+
// RUN: %clang_cc1 -std=c2y -O0 -triple x86_64-unknown-unknown %s -emit-llvm -o - | FileCheck %s
3+
// This tests the codegen for the same test cases as in n3460.c.
4+
5+
// CHECK-LABEL: define dso_local void @test(
6+
// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
7+
// CHECK-NEXT: [[ENTRY:.*]]:
8+
// CHECK-NEXT: [[A:%.*]] = alloca { double, double }, align 8
9+
// CHECK-NEXT: [[B:%.*]] = alloca { double, double }, align 8
10+
// CHECK-NEXT: [[C:%.*]] = alloca { double, double }, align 8
11+
// CHECK-NEXT: [[D:%.*]] = alloca { double, double }, align 8
12+
// CHECK-NEXT: [[E:%.*]] = alloca { double, double }, align 8
13+
// CHECK-NEXT: [[F:%.*]] = alloca { double, double }, align 8
14+
// CHECK-NEXT: [[G:%.*]] = alloca { double, double }, align 8
15+
// CHECK-NEXT: [[H:%.*]] = alloca { double, double }, align 8
16+
// CHECK-NEXT: [[A_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[A]], i32 0, i32 0
17+
// CHECK-NEXT: [[A_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[A]], i32 0, i32 1
18+
// CHECK-NEXT: store double 0.000000e+00, ptr [[A_REALP]], align 8
19+
// CHECK-NEXT: store double 0x7FF0000000000000, ptr [[A_IMAGP]], align 8
20+
// CHECK-NEXT: [[B_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[B]], i32 0, i32 0
21+
// CHECK-NEXT: [[B_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[B]], i32 0, i32 1
22+
// CHECK-NEXT: store double -0.000000e+00, ptr [[B_REALP]], align 8
23+
// CHECK-NEXT: store double -0.000000e+00, ptr [[B_IMAGP]], align 8
24+
// CHECK-NEXT: [[C_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[C]], i32 0, i32 0
25+
// CHECK-NEXT: [[C_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[C]], i32 0, i32 1
26+
// CHECK-NEXT: store double 0.000000e+00, ptr [[C_REALP]], align 8
27+
// CHECK-NEXT: store double 0x7FF0000000000000, ptr [[C_IMAGP]], align 8
28+
// CHECK-NEXT: [[D_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[D]], i32 0, i32 0
29+
// CHECK-NEXT: [[D_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[D]], i32 0, i32 1
30+
// CHECK-NEXT: store double 4.000000e+00, ptr [[D_REALP]], align 8
31+
// CHECK-NEXT: store double 6.000000e+00, ptr [[D_IMAGP]], align 8
32+
// CHECK-NEXT: [[E_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[E]], i32 0, i32 0
33+
// CHECK-NEXT: [[E_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[E]], i32 0, i32 1
34+
// CHECK-NEXT: store double 1.000000e+00, ptr [[E_REALP]], align 8
35+
// CHECK-NEXT: store double 2.000000e+00, ptr [[E_IMAGP]], align 8
36+
// CHECK-NEXT: br i1 false, label %[[COMPLEX_MUL_IMAG_NAN:.*]], label %[[COMPLEX_MUL_CONT:.*]], !prof [[PROF2:![0-9]+]]
37+
// CHECK: [[COMPLEX_MUL_IMAG_NAN]]:
38+
// CHECK-NEXT: br i1 false, label %[[COMPLEX_MUL_LIBCALL:.*]], label %[[COMPLEX_MUL_CONT]], !prof [[PROF2]]
39+
// CHECK: [[COMPLEX_MUL_LIBCALL]]:
40+
// CHECK-NEXT: [[CALL:%.*]] = call { double, double } @__muldc3(double noundef 2.000000e+00, double noundef 3.000000e+00, double noundef 4.000000e+00, double noundef 5.000000e+00) #[[ATTR1:[0-9]+]]
41+
// CHECK-NEXT: [[TMP0:%.*]] = extractvalue { double, double } [[CALL]], 0
42+
// CHECK-NEXT: [[TMP1:%.*]] = extractvalue { double, double } [[CALL]], 1
43+
// CHECK-NEXT: br label %[[COMPLEX_MUL_CONT]]
44+
// CHECK: [[COMPLEX_MUL_CONT]]:
45+
// CHECK-NEXT: [[REAL_MUL_PHI:%.*]] = phi double [ -7.000000e+00, %[[ENTRY]] ], [ -7.000000e+00, %[[COMPLEX_MUL_IMAG_NAN]] ], [ [[TMP0]], %[[COMPLEX_MUL_LIBCALL]] ]
46+
// CHECK-NEXT: [[IMAG_MUL_PHI:%.*]] = phi double [ 2.200000e+01, %[[ENTRY]] ], [ 2.200000e+01, %[[COMPLEX_MUL_IMAG_NAN]] ], [ [[TMP1]], %[[COMPLEX_MUL_LIBCALL]] ]
47+
// CHECK-NEXT: [[F_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[F]], i32 0, i32 0
48+
// CHECK-NEXT: [[F_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[F]], i32 0, i32 1
49+
// CHECK-NEXT: store double [[REAL_MUL_PHI]], ptr [[F_REALP]], align 8
50+
// CHECK-NEXT: store double [[IMAG_MUL_PHI]], ptr [[F_IMAGP]], align 8
51+
// CHECK-NEXT: [[CALL1:%.*]] = call { double, double } @__divdc3(double noundef 2.000000e+00, double noundef 3.000000e+00, double noundef 4.000000e+00, double noundef 5.000000e+00) #[[ATTR1]]
52+
// CHECK-NEXT: [[TMP2:%.*]] = extractvalue { double, double } [[CALL1]], 0
53+
// CHECK-NEXT: [[TMP3:%.*]] = extractvalue { double, double } [[CALL1]], 1
54+
// CHECK-NEXT: [[G_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[G]], i32 0, i32 0
55+
// CHECK-NEXT: [[G_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[G]], i32 0, i32 1
56+
// CHECK-NEXT: store double [[TMP2]], ptr [[G_REALP]], align 8
57+
// CHECK-NEXT: store double [[TMP3]], ptr [[G_IMAGP]], align 8
58+
// CHECK-NEXT: [[CALL2:%.*]] = call { double, double } @__divdc3(double noundef 2.000000e+00, double noundef 0.000000e+00, double noundef 2.000000e+00, double noundef 4.000000e+00) #[[ATTR1]]
59+
// CHECK-NEXT: [[TMP4:%.*]] = extractvalue { double, double } [[CALL2]], 0
60+
// CHECK-NEXT: [[TMP5:%.*]] = extractvalue { double, double } [[CALL2]], 1
61+
// CHECK-NEXT: [[H_REALP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[H]], i32 0, i32 0
62+
// CHECK-NEXT: [[H_IMAGP:%.*]] = getelementptr inbounds nuw { double, double }, ptr [[H]], i32 0, i32 1
63+
// CHECK-NEXT: store double [[TMP4]], ptr [[H_REALP]], align 8
64+
// CHECK-NEXT: store double [[TMP5]], ptr [[H_IMAGP]], align 8
65+
// CHECK-NEXT: ret void
66+
//
67+
void test() {
68+
_Complex double a = __builtin_complex(0.0, __builtin_inf()) * 2.0;
69+
_Complex double b = __builtin_complex(0.0, 1.0) * -0.0;
70+
_Complex double c = __builtin_complex(0.0, __builtin_inf()) / 2.0;
71+
_Complex double d = __builtin_complex(2.0, 3.0) * 2.0;
72+
_Complex double e = __builtin_complex(2.0, 4.0) / 2.0;
73+
_Complex double f = __builtin_complex(2.0, 3.0) * __builtin_complex(4.0, 5.0);
74+
_Complex double g = __builtin_complex(2.0, 3.0) / __builtin_complex(4.0, 5.0);
75+
_Complex double h = 2.0 / __builtin_complex(2.0, 4.0);
76+
}
77+
78+
//.
79+
// CHECK: [[PROF2]] = !{!"branch_weights", i32 1, i32 1048575}
80+
//.

‎clang/test/Driver/offload-Xarch.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// UNSUPPORTED: target={{.*darwin.*}}
2-
31
// RUN: %clang --target=x86_64-unknown-linux-gnu -x cuda %s -Xarch_nvptx64 -O3 -S -nogpulib -nogpuinc -### 2>&1 | FileCheck -check-prefix=O3ONCE %s
42
// RUN: %clang -x cuda %s -Xarch_device -O3 -S -nogpulib -nogpuinc -### 2>&1 | FileCheck -check-prefix=O3ONCE %s
53
// RUN: %clang -x hip %s -Xarch_amdgcn -O3 -S -nogpulib -nogpuinc -### 2>&1 | FileCheck -check-prefix=O3ONCE %s

‎clang/test/Parser/cxx-template-decl.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ template<template<typename> class T> struct shadow8 { // expected-note{{template
109109
template<template<typename> class T> struct inner; // expected-error{{declaration of 'T' shadows template parameter}}
110110
};
111111

112+
template<class>
113+
class shadow9_;
114+
115+
template<class T> // expected-note{{template parameter is declared here}}
116+
class shadow9 : public shadow9_<T> {
117+
using typename shadow9_<T>::T; // expected-error{{declaration of 'T' shadows template parameter}}
118+
};
119+
112120
// Non-type template parameters in scope
113121
template<int Size>
114122
void f(int& i) {

‎clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Verify the ELF packaging of OpenMP SPIR-V device images.
22
// REQUIRES: system-linux
33
// REQUIRES: spirv-tools
4-
// REQUIRES: llvm-spirv
4+
// REQUIRES: spirv-registered-target
55
// RUN: mkdir -p %t_tmp
66
// RUN: cd %t_tmp
77
// RUN: %clangxx -fopenmp -fopenmp-targets=spirv64-intel -nogpulib -c -o %t_clang-linker-wrapper-spirv-elf.o %s

‎clang/test/Tooling/lit.local.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ if config.spirv_tools_tests:
99
config.substitutions.append(("spirv-val", os.path.join(config.llvm_tools_dir, "spirv-val")))
1010
config.substitutions.append(("spirv-as", os.path.join(config.llvm_tools_dir, "spirv-as")))
1111
config.substitutions.append(("spirv-link", os.path.join(config.llvm_tools_dir, "spirv-link")))
12-
13-
if lit.util.which("llvm-spirv"):
14-
config.available_features.add("llvm-spirv")

‎clang/www/c_status.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ <h2 id="c2y">C2y implementation status</h2>
318318
<tr>
319319
<td>Complex operators</td>
320320
<td><a href="https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3460.pdf">N3460</a></td>
321-
<td class="unknown" align="center">Unknown</td>
321+
<td class="full" align="center">Clang 12</td>
322322
</tr>
323323
</table>
324324
</details>

0 commit comments

Comments
 (0)