Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit df3bf34

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:faa4e35c622c13c7a565b979a6676d6cf3040cd4 into amd-gfx:b65e986d8413
Local branch amd-gfx b65e986 Merged main:997e5e870337e4a25b82be5b01e8f7675c350070 into amd-gfx:47ff60c4c995 Remote branch main faa4e35 Revert "[lit] Implement builtin umask (llvm#94621)"
2 parents b65e986 + faa4e35 commit df3bf34

File tree

18 files changed

+70
-88
lines changed

18 files changed

+70
-88
lines changed

‎flang/docs/GettingInvolved.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ To understand the status of various developments in Flang please join the respec
4646

4747
- General updates on the Flang project.
4848
- Join [Flang Community Biweekly Call](https://lanl-us.webex.com/lanl-us/j.php?MTID=mdce13c9bd55202e8071d8128fb953614)
49-
- Meeting number: 177 400 7047
50-
- Password: 6PCdCYKmN43
49+
- If you prefer to join using a meeting number and password, those can be
50+
found in this [Google Doc](https://docs.google.com/document/d/1Z2U5UAtJ-Dag5wlMaLaW1KRmNgENNAYynJqLW2j2AZQ/). Alternative methods of joining, such as call-in numbers, are also available.
5151
- Time: Wednesdays, 8:30 a.m. Pacific Time, on the weeks alternating with regular Flang Community Technical Biweekly Call.
5252
- Meeting minutes are available in this [Google Doc](https://docs.google.com/document/d/1Z2U5UAtJ-Dag5wlMaLaW1KRmNgENNAYynJqLW2j2AZQ/edit).
5353
- Minutes from older meetings were posted on the [Flang forum](https://discourse.llvm.org/c/subprojects/flang). Search for `Flang Biweekly Sync - Notes`.
@@ -56,8 +56,8 @@ To understand the status of various developments in Flang please join the respec
5656

5757
- Technical topics call.
5858
- Join [Flang Community Technical Biweekly Call](https://teams.microsoft.com/l/meetup-join/19%3ameeting_YWU1NzU4ZjQtOTljOS00NWU1LTg5NjktYTUzOTU3MGEwMzAx%40thread.v2/0?context=%7b%22Tid%22%3a%22f34e5979-57d9-4aaa-ad4d-b122a662184d%22%2c%22Oid%22%3a%223641875c-ef5b-4767-8105-0787a195852f%22%7d)
59-
- Meeting ID: 330 223 778 657
60-
- Passcode: 7GjaJ3
59+
- If you prefer to join using a meeting ID and passcode, those can be
60+
found in this [Google Doc](https://docs.google.com/document/d/1Z2U5UAtJ-Dag5wlMaLaW1KRmNgENNAYynJqLW2j2AZQ/). Alternative methods of joining, such as call-in numbers, are also available.
6161
- Time: Mondays, 8:30 a.m. Pacific Time, on the weeks alternating with regular Flang Community Biweekly Call.
6262
- The agenda is in this [Google Doc](https://docs.google.com/document/d/1Z2U5UAtJ-Dag5wlMaLaW1KRmNgENNAYynJqLW2j2AZQ/).
6363

‎libcxx/docs/FeatureTestMacroTable.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Status
178178
---------------------------------------------------------- -----------------
179179
``__cpp_lib_atomic_lock_free_type_aliases`` ``201907L``
180180
---------------------------------------------------------- -----------------
181-
``__cpp_lib_atomic_ref`` *unimplemented*
181+
``__cpp_lib_atomic_ref`` ``201806L``
182182
---------------------------------------------------------- -----------------
183183
``__cpp_lib_atomic_shared_ptr`` *unimplemented*
184184
---------------------------------------------------------- -----------------

‎libcxx/include/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ __cpp_lib_void_t 201411L <type_traits>
366366
# define __cpp_lib_atomic_flag_test 201907L
367367
// # define __cpp_lib_atomic_float 201711L
368368
# define __cpp_lib_atomic_lock_free_type_aliases 201907L
369-
// # define __cpp_lib_atomic_ref 201806L
369+
# define __cpp_lib_atomic_ref 201806L
370370
// # define __cpp_lib_atomic_shared_ptr 201711L
371371
# define __cpp_lib_atomic_value_initialization 201911L
372372
# if _LIBCPP_AVAILABILITY_HAS_SYNC

‎libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,11 @@
200200
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
201201
# endif
202202

203-
# if !defined(_LIBCPP_VERSION)
204-
# ifndef __cpp_lib_atomic_ref
205-
# error "__cpp_lib_atomic_ref should be defined in c++20"
206-
# endif
207-
# if __cpp_lib_atomic_ref != 201806L
208-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
209-
# endif
210-
# else // _LIBCPP_VERSION
211-
# ifdef __cpp_lib_atomic_ref
212-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
213-
# endif
203+
# ifndef __cpp_lib_atomic_ref
204+
# error "__cpp_lib_atomic_ref should be defined in c++20"
205+
# endif
206+
# if __cpp_lib_atomic_ref != 201806L
207+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
214208
# endif
215209

216210
# if !defined(_LIBCPP_VERSION)
@@ -299,17 +293,11 @@
299293
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
300294
# endif
301295

302-
# if !defined(_LIBCPP_VERSION)
303-
# ifndef __cpp_lib_atomic_ref
304-
# error "__cpp_lib_atomic_ref should be defined in c++23"
305-
# endif
306-
# if __cpp_lib_atomic_ref != 201806L
307-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
308-
# endif
309-
# else // _LIBCPP_VERSION
310-
# ifdef __cpp_lib_atomic_ref
311-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
312-
# endif
296+
# ifndef __cpp_lib_atomic_ref
297+
# error "__cpp_lib_atomic_ref should be defined in c++23"
298+
# endif
299+
# if __cpp_lib_atomic_ref != 201806L
300+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
313301
# endif
314302

315303
# if !defined(_LIBCPP_VERSION)
@@ -407,17 +395,11 @@
407395
# endif
408396
# endif
409397

410-
# if !defined(_LIBCPP_VERSION)
411-
# ifndef __cpp_lib_atomic_ref
412-
# error "__cpp_lib_atomic_ref should be defined in c++26"
413-
# endif
414-
# if __cpp_lib_atomic_ref != 201806L
415-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
416-
# endif
417-
# else // _LIBCPP_VERSION
418-
# ifdef __cpp_lib_atomic_ref
419-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
420-
# endif
398+
# ifndef __cpp_lib_atomic_ref
399+
# error "__cpp_lib_atomic_ref should be defined in c++26"
400+
# endif
401+
# if __cpp_lib_atomic_ref != 201806L
402+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
421403
# endif
422404

423405
# if !defined(_LIBCPP_VERSION)

‎libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3254,17 +3254,11 @@
32543254
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
32553255
# endif
32563256

3257-
# if !defined(_LIBCPP_VERSION)
3258-
# ifndef __cpp_lib_atomic_ref
3259-
# error "__cpp_lib_atomic_ref should be defined in c++20"
3260-
# endif
3261-
# if __cpp_lib_atomic_ref != 201806L
3262-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
3263-
# endif
3264-
# else // _LIBCPP_VERSION
3265-
# ifdef __cpp_lib_atomic_ref
3266-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
3267-
# endif
3257+
# ifndef __cpp_lib_atomic_ref
3258+
# error "__cpp_lib_atomic_ref should be defined in c++20"
3259+
# endif
3260+
# if __cpp_lib_atomic_ref != 201806L
3261+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
32683262
# endif
32693263

32703264
# if !defined(_LIBCPP_VERSION)
@@ -4675,17 +4669,11 @@
46754669
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
46764670
# endif
46774671

4678-
# if !defined(_LIBCPP_VERSION)
4679-
# ifndef __cpp_lib_atomic_ref
4680-
# error "__cpp_lib_atomic_ref should be defined in c++23"
4681-
# endif
4682-
# if __cpp_lib_atomic_ref != 201806L
4683-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
4684-
# endif
4685-
# else // _LIBCPP_VERSION
4686-
# ifdef __cpp_lib_atomic_ref
4687-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
4688-
# endif
4672+
# ifndef __cpp_lib_atomic_ref
4673+
# error "__cpp_lib_atomic_ref should be defined in c++23"
4674+
# endif
4675+
# if __cpp_lib_atomic_ref != 201806L
4676+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
46894677
# endif
46904678

46914679
# if !defined(_LIBCPP_VERSION)
@@ -6318,17 +6306,11 @@
63186306
# endif
63196307
# endif
63206308

6321-
# if !defined(_LIBCPP_VERSION)
6322-
# ifndef __cpp_lib_atomic_ref
6323-
# error "__cpp_lib_atomic_ref should be defined in c++26"
6324-
# endif
6325-
# if __cpp_lib_atomic_ref != 201806L
6326-
# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
6327-
# endif
6328-
# else // _LIBCPP_VERSION
6329-
# ifdef __cpp_lib_atomic_ref
6330-
# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
6331-
# endif
6309+
# ifndef __cpp_lib_atomic_ref
6310+
# error "__cpp_lib_atomic_ref should be defined in c++26"
6311+
# endif
6312+
# if __cpp_lib_atomic_ref != 201806L
6313+
# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
63326314
# endif
63336315

63346316
# if !defined(_LIBCPP_VERSION)

‎libcxx/utils/generate_feature_test_macro_components.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ def add_version_header(tc):
184184
"name": "__cpp_lib_atomic_ref",
185185
"values": {"c++20": 201806},
186186
"headers": ["atomic"],
187-
"unimplemented": True,
188187
},
189188
{
190189
"name": "__cpp_lib_atomic_shared_ptr",

‎libcxx/utils/libcxx-lit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fi
3030

3131
if [[ "${1}" == "-b" || "${1}" == "--bootstrap" ]]; then
3232
type="runtimes"
33-
shift
33+
shift
3434
fi
3535

3636
if [[ $# -lt 1 ]]; then

‎llvm/include/llvm/Config/llvm-config.h.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Indicate that this is LLVM compiled from the amd-gfx branch. */
1818
#define LLVM_HAVE_BRANCH_AMD_GFX
19-
#define LLVM_MAIN_REVISION 504334
19+
#define LLVM_MAIN_REVISION 504343
2020

2121
/* Define if LLVM_ENABLE_DUMP is enabled */
2222
#cmakedefine LLVM_ENABLE_DUMP

‎llvm/include/llvm/IR/DerivedTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ class ScalableVectorType : public VectorType {
631631

632632
/// Get the minimum number of elements in this vector. The actual number of
633633
/// elements in the vector is an integer multiple of this value.
634-
uint64_t getMinNumElements() const { return ElementQuantity; }
634+
unsigned getMinNumElements() const { return ElementQuantity; }
635635

636636
static bool classof(const Type *T) {
637637
return T->getTypeID() == ScalableVectorTyID;

‎llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5649,7 +5649,7 @@ bool SelectionDAG::isKnownNeverZero(SDValue Op, unsigned Depth) const {
56495649
const APInt &Multiplier = Op.getConstantOperandAPInt(0);
56505650
ConstantRange CR =
56515651
getVScaleRange(&F, Op.getScalarValueSizeInBits()).multiply(Multiplier);
5652-
if (!CR.getUnsignedMin().isZero())
5652+
if (!CR.contains(APInt(CR.getBitWidth(), 0)))
56535653
return true;
56545654
break;
56555655
}

0 commit comments

Comments
 (0)