Skip to content

Commit adfcdd5

Browse files
author
z1_cciauto
authored
merge main into amd-staging (llvm#4041)
2 parents ce714aa + add0ced commit adfcdd5

File tree

12 files changed

+66
-17
lines changed

12 files changed

+66
-17
lines changed

clang-tools-extra/docs/ReleaseNotes.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,21 @@ infrastructure are described first, followed by tool-specific sections.
4646
Major New Features
4747
------------------
4848

49+
Potentially Breaking Changes
50+
----------------------------
51+
52+
- Removed :program:`clang-tidy`'s global options `IgnoreMacros` and
53+
`StrictMode`, which were documented as deprecated since
54+
:program:`clang-tidy-20`. Users should use the check-specific options of the
55+
same name instead.
56+
57+
- Renamed :program:`clang-tidy`'s option name of check
58+
:doc:`bugprone-easily-swappable-parameters
59+
<clang-tidy/checks/bugprone/easily-swappable-parameters>` from
60+
``NamePrefixSuffixSilenceDissimilarityTreshold`` to
61+
``NamePrefixSuffixSilenceDissimilarityThreshold``,
62+
correcting a spelling mistake.
63+
4964
Improvements to clangd
5065
----------------------
5166

clang-tools-extra/docs/ReleaseNotesTemplate.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ infrastructure are described first, followed by tool-specific sections.
4646
Major New Features
4747
------------------
4848

49+
Potentially Breaking Changes
50+
----------------------------
51+
4952
Improvements to clangd
5053
----------------------
5154

clang/include/clang/CIR/MissingFeatures.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ struct MissingFeatures {
296296
// Future CIR operations
297297
static bool awaitOp() { return false; }
298298
static bool callOp() { return false; }
299-
static bool complexImagOp() { return false; }
300-
static bool complexRealOp() { return false; }
301299
static bool ifOp() { return false; }
302300
static bool invokeOp() { return false; }
303301
static bool labelOp() { return false; }

clang/lib/CIR/Dialect/IR/CIRDialect.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,9 +1754,6 @@ LogicalResult cir::BinOp::verify() {
17541754
return emitError() << "The nsw/nuw flags and the saturated flag are "
17551755
"mutually exclusive";
17561756

1757-
assert(!cir::MissingFeatures::complexType());
1758-
// TODO(cir): verify for complex binops
1759-
17601757
return mlir::success();
17611758
}
17621759

clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ void CIRCanonicalizePass::runOnOperation() {
134134
getOperation()->walk([&](Operation *op) {
135135
assert(!cir::MissingFeatures::switchOp());
136136
assert(!cir::MissingFeatures::tryOp());
137-
assert(!cir::MissingFeatures::complexRealOp());
138-
assert(!cir::MissingFeatures::complexImagOp());
139137
assert(!cir::MissingFeatures::callOp());
140138

141139
// Many operations are here to perform a manual `fold` in
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import lit.formats
2+
3+
config.name = "shtest-ulimit"
4+
config.suffixes = [".txt"]
5+
config.test_format = lit.formats.ShTest(execute_external=False)
6+
config.test_source_root = None
7+
config.test_exec_root = None
8+
config.substitutions.append(("%{python}", '"%s"' % (sys.executable)))
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# RUN: ulimit -v 1048576
2+
# RUN: %{python} %S/../shtest-ulimit/print_limits.py
3+
# Fail the test so that we can assert on the output.
4+
# RUN: not echo return

llvm/utils/lit/tests/Inputs/shtest-ulimit/ulimit_okay.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# RUN: ulimit -v 1048576
21
# RUN: ulimit -n 50
32
# RUN: %{python} %S/print_limits.py
43
# Fail the test so that we can assert on the output.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Check the ulimit command
2+
3+
# ulimit does not work on non-POSIX platforms.
4+
# These tests are specific to options that Darwin does not support.
5+
# UNSUPPORTED: system-windows, system-darwin
6+
7+
# RUN: not %{lit} -a -v %{inputs}/shtest-ulimit-nondarwin | FileCheck %s
8+
9+
# CHECK: -- Testing: 1 tests{{.*}}
10+
11+
# CHECK-LABEL: FAIL: shtest-ulimit :: ulimit_okay.txt ({{[^)]*}})
12+
# CHECK: ulimit -v 1048576
13+
# CHECK: RLIMIT_AS=1073741824
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# Check the ulimit command
22

33
# ulimit does not work on non-POSIX platforms.
4-
# UNSUPPORTED: system-windows
5-
6-
# TODO(boomanaiden154): The test fails on some non-Linux POSIX
7-
# platforms (like MacOS) due to the underlying system not supporting
8-
# ulimit -v. This test needs to be carved up so we keep full test
9-
# coverage on Linux and as much as possible on other platforms.
10-
# REQUIRES: system-linux
4+
# Solaris for some reason does not respect ulimit -n, so mark it unsupported
5+
# as well.
6+
# UNSUPPORTED: system-windows, system-solaris
117

128
# RUN: not %{lit} -a -v %{inputs}/shtest-ulimit | FileCheck %s
139

@@ -18,7 +14,5 @@
1814
# CHECK: 'ulimit' requires two arguments
1915

2016
# CHECK-LABEL: FAIL: shtest-ulimit :: ulimit_okay.txt ({{[^)]*}})
21-
# CHECK: ulimit -v 1048576
2217
# CHECK: ulimit -n 50
23-
# CHECK: RLIMIT_AS=1073741824
2418
# CHECK: RLIMIT_NOFILE=50

0 commit comments

Comments
 (0)