Skip to content

Commit e9fc178

Browse files
author
Jenkins
committed
merge main into amd-staging
Change-Id: I96b0a40da7c37197bf0ad7db569b109d190736a8
2 parents 1d1664a + c26a993 commit e9fc178

File tree

26 files changed

+768
-1259
lines changed

26 files changed

+768
-1259
lines changed

‎clang/lib/Serialization/ASTWriter.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3205,9 +3205,7 @@ void ASTWriter::WritePragmaDiagnosticMappings(const DiagnosticsEngine &Diag,
32053205
}
32063206

32073207
// Sort by diag::kind for deterministic output.
3208-
llvm::sort(Mappings, [](const auto &LHS, const auto &RHS) {
3209-
return LHS.first < RHS.first;
3210-
});
3208+
llvm::sort(Mappings, llvm::less_first());
32113209

32123210
for (const auto &I : Mappings) {
32133211
Record.push_back(I.first);

‎clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,7 @@ static void canonicalizeDefines(PreprocessorOptions &PPOpts) {
259259
++Index;
260260
}
261261

262-
llvm::stable_sort(SimpleNames, [](const MacroOpt &A, const MacroOpt &B) {
263-
return A.first < B.first;
264-
});
262+
llvm::stable_sort(SimpleNames, llvm::less_first());
265263
// Keep the last instance of each macro name by going in reverse
266264
auto NewEnd = std::unique(
267265
SimpleNames.rbegin(), SimpleNames.rend(),

‎clang/www/cxx_dr_status.html

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12670,7 +12670,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
1267012670
</tr>
1267112671
<tr class="open" id="2144">
1267212672
<td><a href="https://cplusplus.github.io/CWG/issues/2144.html">2144</a></td>
12673-
<td>drafting</td>
12673+
<td>tentatively ready</td>
1267412674
<td>Function/variable declaration ambiguity</td>
1267512675
<td align="center">Not resolved</td>
1267612676
</tr>
@@ -17081,7 +17081,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
1708117081
</tr>
1708217082
<tr class="open" id="2879">
1708317083
<td><a href="https://cplusplus.github.io/CWG/issues/2879.html">2879</a></td>
17084-
<td>open</td>
17084+
<td>drafting</td>
1708517085
<td>Undesired outcomes with <TT>const_cast</TT></td>
1708617086
<td align="center">Not resolved</td>
1708717087
</tr>
@@ -17099,13 +17099,13 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
1709917099
</tr>
1710017100
<tr class="open" id="2882">
1710117101
<td><a href="https://cplusplus.github.io/CWG/issues/2882.html">2882</a></td>
17102-
<td>open</td>
17102+
<td>tentatively ready</td>
1710317103
<td>Unclear treatment of conversion to <TT>void</TT></td>
1710417104
<td align="center">Not resolved</td>
1710517105
</tr>
1710617106
<tr class="open" id="2883">
1710717107
<td><a href="https://cplusplus.github.io/CWG/issues/2883.html">2883</a></td>
17108-
<td>open</td>
17108+
<td>tentatively ready</td>
1710917109
<td>Definition of "odr-usable" ignores lambda scopes</td>
1711017110
<td align="center">Not resolved</td>
1711117111
</tr>
@@ -17117,25 +17117,25 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
1711717117
</tr>
1711817118
<tr class="open" id="2885">
1711917119
<td><a href="https://cplusplus.github.io/CWG/issues/2885.html">2885</a></td>
17120-
<td>review</td>
17120+
<td>tentatively ready</td>
1712117121
<td>Non-eligible trivial default constructors</td>
1712217122
<td align="center">Not resolved</td>
1712317123
</tr>
1712417124
<tr class="open" id="2886">
1712517125
<td><a href="https://cplusplus.github.io/CWG/issues/2886.html">2886</a></td>
17126-
<td>open</td>
17126+
<td>tentatively ready</td>
1712717127
<td>Temporaries and trivial potentially-throwing special member functions</td>
1712817128
<td align="center">Not resolved</td>
1712917129
</tr>
1713017130
<tr class="open" id="2887">
1713117131
<td><a href="https://cplusplus.github.io/CWG/issues/2887.html">2887</a></td>
17132-
<td>open</td>
17132+
<td>tentatively ready</td>
1713317133
<td>Missing compatibility entries for xvalues</td>
1713417134
<td align="center">Not resolved</td>
1713517135
</tr>
1713617136
<tr class="open" id="2888">
1713717137
<td><a href="https://cplusplus.github.io/CWG/issues/2888.html">2888</a></td>
17138-
<td>open</td>
17138+
<td>review</td>
1713917139
<td>Missing cases for reference and array types for argument-dependent lookup</td>
1714017140
<td align="center">Not resolved</td>
1714117141
</tr>
@@ -17153,9 +17153,39 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
1715317153
</tr>
1715417154
<tr class="open" id="2891">
1715517155
<td><a href="https://cplusplus.github.io/CWG/issues/2891.html">2891</a></td>
17156-
<td>review</td>
17156+
<td>tentatively ready</td>
1715717157
<td>Normative status of implementation limits</td>
1715817158
<td align="center">Not resolved</td>
17159+
</tr>
17160+
<tr class="open" id="2892">
17161+
<td><a href="https://cplusplus.github.io/CWG/issues/2892.html">2892</a></td>
17162+
<td>tentatively ready</td>
17163+
<td>Unclear usual arithmetic conversions</td>
17164+
<td align="center">Not resolved</td>
17165+
</tr>
17166+
<tr class="open" id="2893">
17167+
<td><a href="https://cplusplus.github.io/CWG/issues/2893.html">2893</a></td>
17168+
<td>open</td>
17169+
<td>Instantiations in discarded <TT>if constexpr</TT> substatements</td>
17170+
<td align="center">Not resolved</td>
17171+
</tr>
17172+
<tr class="open" id="2894">
17173+
<td><a href="https://cplusplus.github.io/CWG/issues/2894.html">2894</a></td>
17174+
<td>open</td>
17175+
<td>Functional casts create prvalues of reference type</td>
17176+
<td align="center">Not resolved</td>
17177+
</tr>
17178+
<tr class="open" id="2895">
17179+
<td><a href="https://cplusplus.github.io/CWG/issues/2895.html">2895</a></td>
17180+
<td>open</td>
17181+
<td>Initialization should ignore the destination type's cv-qualification</td>
17182+
<td align="center">Not resolved</td>
17183+
</tr>
17184+
<tr class="open" id="2896">
17185+
<td><a href="https://cplusplus.github.io/CWG/issues/2896.html">2896</a></td>
17186+
<td>open</td>
17187+
<td>Template argument deduction involving exception specifications</td>
17188+
<td align="center">Not resolved</td>
1715917189
</tr></table>
1716017190

1716117191
</div>

‎libcxx/test/std/atomics/atomics.ref/member_types.pass.cpp renamed to ‎libcxx/test/std/atomics/atomics.ref/member_types.compile.pass.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,3 @@ void testall() {
128128
test<long double>();
129129
// + TODO extended floating-point types
130130
}
131-
132-
int main(int, char**) { return 0; }

‎libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.pass.cpp renamed to ‎libcxx/test/std/concepts/concepts.compare/concepts.totallyordered/totally_ordered.compile.pass.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,25 +74,25 @@ static_assert(!std::totally_ordered<int (S::*)() noexcept>);
7474
static_assert(!std::totally_ordered<int (S::*)() &>);
7575
static_assert(!std::totally_ordered<int (S::*)() & noexcept>);
7676
static_assert(!std::totally_ordered<int (S::*)() &&>);
77-
static_assert(!std::totally_ordered < int (S::*)() && noexcept >);
77+
static_assert(!std::totally_ordered < int(S::*)() && noexcept >);
7878
static_assert(!std::totally_ordered<int (S::*)() const>);
7979
static_assert(!std::totally_ordered<int (S::*)() const noexcept>);
8080
static_assert(!std::totally_ordered<int (S::*)() const&>);
8181
static_assert(!std::totally_ordered<int (S::*)() const & noexcept>);
8282
static_assert(!std::totally_ordered<int (S::*)() const&&>);
83-
static_assert(!std::totally_ordered < int (S::*)() const&& noexcept >);
83+
static_assert(!std::totally_ordered < int(S::*)() const&& noexcept >);
8484
static_assert(!std::totally_ordered<int (S::*)() volatile>);
8585
static_assert(!std::totally_ordered<int (S::*)() volatile noexcept>);
8686
static_assert(!std::totally_ordered<int (S::*)() volatile&>);
8787
static_assert(!std::totally_ordered<int (S::*)() volatile & noexcept>);
8888
static_assert(!std::totally_ordered<int (S::*)() volatile&&>);
89-
static_assert(!std::totally_ordered < int (S::*)() volatile&& noexcept >);
89+
static_assert(!std::totally_ordered < int(S::*)() volatile && noexcept >);
9090
static_assert(!std::totally_ordered<int (S::*)() const volatile>);
9191
static_assert(!std::totally_ordered<int (S::*)() const volatile noexcept>);
9292
static_assert(!std::totally_ordered<int (S::*)() const volatile&>);
9393
static_assert(!std::totally_ordered<int (S::*)() const volatile & noexcept>);
9494
static_assert(!std::totally_ordered<int (S::*)() const volatile&&>);
95-
static_assert(!std::totally_ordered < int (S::*)() const volatile&& noexcept >);
95+
static_assert(!std::totally_ordered < int(S::*)() const volatile&& noexcept >);
9696

9797
static_assert(!std::totally_ordered<void>);
9898
} // namespace fundamentals
@@ -146,14 +146,10 @@ static_assert(!std::totally_ordered<wrong_return_type>);
146146

147147
static_assert(!std::totally_ordered<cxx20_member_eq_operator_with_deleted_ne>);
148148
static_assert(!std::totally_ordered<cxx20_friend_eq_operator_with_deleted_ne>);
149-
static_assert(
150-
!std::totally_ordered<member_three_way_comparable_with_deleted_eq>);
151-
static_assert(
152-
!std::totally_ordered<member_three_way_comparable_with_deleted_ne>);
153-
static_assert(
154-
!std::totally_ordered<friend_three_way_comparable_with_deleted_eq>);
155-
static_assert(
156-
!std::totally_ordered<friend_three_way_comparable_with_deleted_ne>);
149+
static_assert(!std::totally_ordered<member_three_way_comparable_with_deleted_eq>);
150+
static_assert(!std::totally_ordered<member_three_way_comparable_with_deleted_ne>);
151+
static_assert(!std::totally_ordered<friend_three_way_comparable_with_deleted_eq>);
152+
static_assert(!std::totally_ordered<friend_three_way_comparable_with_deleted_ne>);
157153

158154
static_assert(!std::totally_ordered<eq_returns_explicit_bool>);
159155
static_assert(!std::totally_ordered<ne_returns_explicit_bool>);
@@ -168,5 +164,3 @@ static_assert(std::totally_ordered<partial_ordering_totally_ordered_with>);
168164
static_assert(std::totally_ordered<weak_ordering_totally_ordered_with>);
169165
static_assert(std::totally_ordered<strong_ordering_totally_ordered_with>);
170166
} // namespace types_fit_for_purpose
171-
172-
int main(int, char**) { return 0; }

0 commit comments

Comments
 (0)