Skip to content

Commit 8184d59

Browse files
authored
Merge branch 'llvm:main' into main
2 parents e92a1f0 + a070dbb commit 8184d59

File tree

37 files changed

+685
-3351
lines changed

37 files changed

+685
-3351
lines changed

.ci/all_requirements.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ ml-dtypes==0.5.1 ; python_version < "3.13" \
194194
--hash=sha256:d13755f8e8445b3870114e5b6240facaa7cb0c3361e54beba3e07fa912a6e12b \
195195
--hash=sha256:fd918d4e6a4e0c110e2e05be7a7814d10dc1b95872accbf6512b80a109b71ae1
196196
# via -r mlir/python/requirements.txt
197-
nanobind==2.7.0 \
198-
--hash=sha256:73b12d0e751d140d6c1bf4b215e18818a8debfdb374f08dc3776ad208d808e74 \
199-
--hash=sha256:f9f1b160580c50dcf37b6495a0fd5ec61dc0d95dae5f8004f87dd9ad7eb46b34
197+
nanobind==2.9.2 \
198+
--hash=sha256:c37957ffd5eac7eda349cff3622ecd32e5ee1244ecc912c99b5bc8188bafd16e \
199+
--hash=sha256:e7608472de99d375759814cab3e2c94aba3f9ec80e62cfef8ced495ca5c27d6e
200200
# via -r mlir/python/requirements.txt
201201
numpy==2.0.2 \
202202
--hash=sha256:0123ffdaa88fa4ab64835dcbde75dcdf89c453c922f18dced6e27c90d1d0ec5a \
@@ -383,6 +383,10 @@ swig==4.3.1 \
383383
--hash=sha256:efec16327029f682f649a26da726bb0305be8800bd0f1fa3e81bf0769cf5b476 \
384384
--hash=sha256:fc496c0d600cf1bb2d91e28d3d6eae9c4301e5ea7a0dec5a4281b5efed4245a8
385385
# via -r lldb/test/requirements.txt
386+
typing-extensions==4.15.0 \
387+
--hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \
388+
--hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548
389+
# via -r mlir/python/requirements.txt
386390
urllib3==2.5.0 \
387391
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
388392
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc

clang/test/Analysis/ctu-import-type-decl-definition.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
// RUN: %clang_cc1 -emit-pch -o %t/import.c.ast %t/import.c
66

7-
// RUN: %clang_extdef_map -- -x c %t/import.c >> %t/externalDefMap.txt
8-
// RUN: sed -i='' 's/$/.ast/' %t/externalDefMap.txt
7+
// RUN: %clang_extdef_map -- -x c %t/import.c >> %t/externalDefMap.tmp.txt
8+
// RUN: sed 's/$/.ast/' %t/externalDefMap.tmp.txt >> %t/externalDefMap.txt
99

1010
// RUN: %clang_cc1 -analyze \
1111
// RUN: -analyzer-checker=core \

flang/lib/Semantics/check-omp-atomic.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ struct ReassocRewriter : public evaluate::rewrite::Identity {
157157
// inside of the visitor function in common::visit.
158158
// Since this works with clang, MSVC and at least GCC 8.5, I'm assuming
159159
// that this is some kind of a GCC issue.
160-
using MatchTypes = std::tuple<evaluate::Add<T>, evaluate::Multiply<T>>;
160+
using MatchTypes = std::tuple<evaluate::Add<T>, evaluate::Multiply<T>,
161+
evaluate::LogicalOperation<T::kind>>;
161162
#else
162163
using MatchTypes = typename decltype(outer1)::MatchTypes;
163164
#endif

libcxx/utils/parse-spec-result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def main(argv):
102102
benchmark = headers.index('Benchmark')
103103
time = headers.index('Est. Base Run Time')
104104
for row in rows:
105-
print(f'{row[benchmark].replace('.', '_')}.execution_time {row[time]}')
105+
print(f'{row[benchmark].replace(".", "_")}.execution_time {row[time]}')
106106

107107
if __name__ == '__main__':
108108
main(sys.argv[1:])

lldb/packages/Python/lldbsuite/test/decorators.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# System modules
2+
3+
# allow the use of the `list[str]` type hint in Python 3.8
4+
from __future__ import annotations
5+
26
from functools import wraps
37
from packaging import version
48
import ctypes

lldb/source/Commands/Options.td

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ let Command = "target modules dump separate debug info" in {
1818
: Option<"errors-only", "e">,
1919
Group<1>,
2020
Desc<"Filter to show only debug info files with ${e}rrors.">;
21-
def tm_force_load_all_debug_info : Option<"force-load-all-debug-info", "f">,
22-
Group<1>,
23-
Desc<"Load all debug in${f}o files.">;
21+
def tm_force_load_all_debug_info
22+
: Option<"force-load-all-debug-info", "f">,
23+
Group<1>,
24+
Desc<"${F}orce load all debug info files.">;
2425
}
2526

2627
let Command = "help" in {
@@ -124,20 +125,20 @@ let Command = "breakpoint modify" in {
124125
: Option<"thread-name", "T">,
125126
Group<1>,
126127
Arg<"ThreadName">,
127-
Desc<"The breakpoint stops only for the thread whose thread name "
128+
Desc<"The breakpoint stops only for the ${t}hread whose thread name "
128129
"matches this argument.">;
129130
def breakpoint_modify_queue_name
130131
: Option<"queue-name", "q">,
131132
Group<1>,
132133
Arg<"QueueName">,
133-
Desc<"The breakpoint stops only for threads in the queue whose name is "
134-
"given by this argument.">;
134+
Desc<"The breakpoint stops only for threads in the ${q}ueue whose name "
135+
"is given by this argument.">;
135136
def breakpoint_modify_condition
136137
: Option<"condition", "c">,
137138
Group<1>,
138139
Arg<"Expression">,
139-
Desc<"The breakpoint stops only if this condition expression evaluates "
140-
"to true.">;
140+
Desc<"The breakpoint stops only if this ${c}ondition expression "
141+
"evaluates to true.">;
141142
def breakpoint_modify_condition_language
142143
: Option<"condition-language", "Y">,
143144
Group<1>,
@@ -241,7 +242,7 @@ let Command = "breakpoint set" in {
241242
Arg<"FullName">,
242243
Required,
243244
Completion<"Symbol">,
244-
Desc<"Set the breakpoint by ${F}ully qualified function names. For C++ "
245+
Desc<"Set the breakpoint by ${f}ully qualified function names. For C++ "
245246
"this means namespaces and all arguments, and for Objective-C "
246247
"this means a full function prototype with class and selector. "
247248
"Can be repeated multiple times to make one breakpoint for "
@@ -362,13 +363,13 @@ let Command = "breakpoint clear" in {
362363
Arg<"Filename">,
363364
Completion<"SourceFile">,
364365
Desc<"Specify the breakpoint by source location "
365-
"in this particular file.">;
366+
"in this particular ${f}ile.">;
366367
def breakpoint_clear_line : Option<"line", "l">,
367368
Group<1>,
368369
Arg<"LineNum">,
369370
Required,
370371
Desc<"Specify the breakpoint by source location "
371-
"at this particular line.">;
372+
"at this particular ${l}ine.">;
372373
}
373374

374375
let Command = "breakpoint delete" in {
@@ -437,7 +438,7 @@ let Command = "breakpoint read" in {
437438
Arg<"Filename">,
438439
Required,
439440
Completion<"DiskFile">,
440-
Desc<"The file from which to read the breakpoints.">;
441+
Desc<"The ${f}ile from which to read the breakpoints.">;
441442
def breakpoint_read_breakpoint_name
442443
: Option<"breakpoint-name", "N">,
443444
Arg<"BreakpointName">,
@@ -450,18 +451,18 @@ let Command = "breakpoint write" in {
450451
Arg<"Filename">,
451452
Required,
452453
Completion<"DiskFile">,
453-
Desc<"The file into which to write the breakpoints.">;
454+
Desc<"The ${f}ile into which to write the breakpoints.">;
454455
def breakpoint_write_append
455456
: Option<"append", "a">,
456-
Desc<"Append to saved breakpoints file if it exists.">;
457+
Desc<"${A}ppend to saved breakpoints file if it exists.">;
457458
}
458459

459460
let Command = "breakpoint command add" in {
460461
def breakpoint_add_one_liner
461462
: Option<"one-liner", "o">,
462463
Group<1>,
463464
Arg<"OneLiner">,
464-
Desc<"Specify a one-line breakpoint command inline. Be sure to "
465+
Desc<"Specify a ${o}ne-line breakpoint command inline. Be sure to "
465466
"surround it with quotes.">;
466467
def breakpoint_add_stop_on_error
467468
: Option<"stop-on-error", "e">,
@@ -488,32 +489,33 @@ let Command = "breakpoint command delete" in {
488489
}
489490

490491
let Command = "disassemble" in {
491-
def disassemble_options_bytes : Option<"bytes", "b">,
492-
Desc<"Show opcode bytes when disassembling.">;
492+
def disassemble_options_bytes
493+
: Option<"bytes", "b">,
494+
Desc<"Show opcode ${b}ytes when disassembling.">;
493495
def disassemble_options_kind
494496
: Option<"kind", "k">,
495-
Desc<"Show instruction control flow kind. Refer to the enum "
497+
Desc<"Show instruction control flow ${k}ind. Refer to the enum "
496498
"`InstructionControlFlowKind` for a list of control flow kind. As "
497499
"an important note, far jumps, far calls and far returns often "
498500
"indicate calls to and from kernel.">;
499501
def disassemble_options_context
500502
: Option<"context", "C">,
501503
Arg<"NumLines">,
502-
Desc<"Number of context lines of source to show.">;
504+
Desc<"Number of ${c}ontext lines of source to show.">;
503505
def disassemble_options_mixed
504506
: Option<"mixed", "m">,
505-
Desc<"Enable mixed source and assembly display.">;
507+
Desc<"Enable ${m}ixed source and assembly display.">;
506508
def disassemble_options_raw
507509
: Option<"raw", "r">,
508-
Desc<"Print raw disassembly with no symbol information.">;
510+
Desc<"Print ${r}aw disassembly with no symbol information.">;
509511
def disassemble_options_plugin
510512
: Option<"plugin", "P">,
511513
Arg<"Plugin">,
512-
Desc<"Name of the disassembler plugin you want to use.">;
514+
Desc<"Name of the disassembler ${p}lugin you want to use.">;
513515
def disassemble_options_flavor
514516
: Option<"flavor", "F">,
515517
Arg<"DisassemblyFlavor">,
516-
Desc<"Name of the disassembly flavor you want to use. Currently the "
518+
Desc<"Name of the disassembly ${f}lavor you want to use. Currently the "
517519
"only valid options are default, and for Intel architectures, att "
518520
"and intel.">;
519521
def disassemble_options_cpu : Option<"cpu", "X">,
@@ -526,7 +528,7 @@ let Command = "disassemble" in {
526528
def disassemble_options_arch
527529
: Option<"arch", "A">,
528530
Arg<"Architecture">,
529-
Desc<"Specify the architecture to use for cross disassembly.">;
531+
Desc<"Specify the ${a}rchitecture to use for cross disassembly.">;
530532
def disassemble_options_start_address
531533
: Option<"start-address", "s">,
532534
Groups<[1, 2]>,
@@ -547,31 +549,31 @@ let Command = "disassemble" in {
547549
Group<3>,
548550
Arg<"FunctionName">,
549551
Completion<"Symbol">,
550-
Desc<"Disassemble entire contents of the given function name.">;
552+
Desc<"Disassemble entire contents of the given function ${n}ame.">;
551553
def disassemble_options_frame
552554
: Option<"frame", "f">,
553555
Group<4>,
554556
Desc<"Disassemble from the start of the current frame's function.">;
555557
def disassemble_options_pc : Option<"pc", "p">,
556558
Group<5>,
557-
Desc<"Disassemble around the current pc.">;
558-
def disassemble_options_line : Option<"line", "l">,
559-
Group<6>,
560-
Desc<"Disassemble the current frame's current "
561-
"source line instructions if "
562-
"there is debug line table information, "
563-
"else disassemble around the pc.">;
559+
Desc<"Disassemble around the current ${p}c.">;
560+
def disassemble_options_line
561+
: Option<"line", "l">,
562+
Group<6>,
563+
Desc<"Disassemble the current frame's current source ${l}ine "
564+
"instructions if there is debug line table information, else "
565+
"disassemble around the pc.">;
564566
def disassemble_options_address
565567
: Option<"address", "a">,
566568
Group<7>,
567569
Arg<"AddressOrExpression">,
568-
Desc<"Disassemble function containing this address.">;
570+
Desc<"Disassemble function containing this ${a}ddress.">;
569571
def disassemble_options_force : Option<"force", "\\x01">,
570572
Groups<[2, 3, 4, 5, 7]>,
571573
Desc<"Force disassembly of large functions.">;
572574
def disassemble_options_variable
573575
: Option<"variable", "v">,
574-
Desc<"Enable variable disassembly annotations for this invocation.">;
576+
Desc<"Enable ${v}ariable disassembly annotations for this invocation.">;
575577
}
576578

577579
let Command = "diagnostics dump" in {
@@ -587,18 +589,19 @@ let Command = "expression" in {
587589
: Option<"all-threads", "a">,
588590
Groups<[1, 2]>,
589591
Arg<"Boolean">,
590-
Desc<"Should we run all threads if the execution doesn't complete on "
591-
"one thread.">;
592+
Desc<
593+
"Should we run ${a}ll threads if the execution doesn't complete on "
594+
"one thread.">;
592595
def expression_options_ignore_breakpoints
593596
: Option<"ignore-breakpoints", "i">,
594597
Groups<[1, 2]>,
595598
Arg<"Boolean">,
596-
Desc<"Ignore breakpoint hits while running expressions">;
599+
Desc<"${I}gnore breakpoint hits while running expressions">;
597600
def expression_options_timeout
598601
: Option<"timeout", "t">,
599602
Groups<[1, 2]>,
600603
Arg<"UnsignedInteger">,
601-
Desc<"Timeout value (in microseconds) for running the expression.">;
604+
Desc<"${T}imeout value (in microseconds) for running the expression.">;
602605
def expression_options_unwind_on_error
603606
: Option<"unwind-on-error", "u">,
604607
Groups<[1, 2]>,
@@ -1708,36 +1711,37 @@ let Command = "target stop hook add" in {
17081711
def target_stop_hook_add_queue_name
17091712
: Option<"queue-name", "q">,
17101713
Arg<"QueueName">,
1711-
Desc<"The stop hook is run only for threads in the queue whose name is "
1712-
"given by this argument.">;
1713-
def target_stop_hook_add_file
1714-
: Option<"file", "f">,
1715-
Groups<[1, 4]>,
1716-
Arg<"Filename">,
1717-
Desc<"Specify the source file within which the stop-hook "
1718-
"is to be run.">,
1719-
Completion<"SourceFile">;
1714+
Desc<"The stop hook is run only for threads in the ${q}ueue whose name "
1715+
"is given by this argument.">;
1716+
def target_stop_hook_add_file : Option<"file", "f">,
1717+
Groups<[1, 4]>,
1718+
Arg<"Filename">,
1719+
Desc<"Specify the source ${f}ile within "
1720+
"which the stop-hook is to be run.">,
1721+
Completion<"SourceFile">;
17201722
def target_stop_hook_add_start_line
17211723
: Option<"start-line", "l">,
17221724
Groups<[1, 4]>,
17231725
Arg<"LineNum">,
1724-
Desc<"Set the start of the line range for which the "
1726+
Desc<"Set the start of the ${l}ine range for which the "
17251727
"stop-hook is to be run.">;
1726-
def target_stop_hook_add_end_line : Option<"end-line", "e">,
1727-
Groups<[1, 4]>,
1728-
Arg<"LineNum">,
1729-
Desc<"Set the end of the line range for "
1730-
"which the stop-hook is to be run.">;
1728+
def target_stop_hook_add_end_line
1729+
: Option<"end-line", "e">,
1730+
Groups<[1, 4]>,
1731+
Arg<"LineNum">,
1732+
Desc<"Set the ${e}nd of the line range for which the stop-hook is to "
1733+
"be run.">;
17311734
def target_stop_hook_add_classname
17321735
: Option<"classname", "c">,
17331736
Groups<[2, 5]>,
17341737
Arg<"ClassName">,
1735-
Desc<"Specify the class within which the stop-hook is to be run.">;
1738+
Desc<"Specify the ${c}lass within which the stop-hook is to be run.">;
17361739
def target_stop_hook_add_name
17371740
: Option<"name", "n">,
17381741
Groups<[3, 6]>,
17391742
Arg<"FunctionName">,
1740-
Desc<"Set the function name within which the stop hook will be run.">,
1743+
Desc<
1744+
"Set the ${f}unction name within which the stop hook will be run.">,
17411745
Completion<"Symbol">;
17421746
def target_stop_hook_add_auto_continue
17431747
: Option<"auto-continue", "G">,
@@ -1746,7 +1750,7 @@ let Command = "target stop hook add" in {
17461750
def target_stop_hook_add_at_initial_stop
17471751
: Option<"at-initial-stop", "I">,
17481752
Arg<"Boolean">,
1749-
Desc<"Whether the stop-hook will trigger when lldb initially gains "
1753+
Desc<"Whether the stop-hook will trigger when lldb ${i}nitially gains "
17501754
"control of the process. For a process launch, this initial stop "
17511755
"may happen very early on - before the loader has run. You can "
17521756
"use this option if you do not want some stop-hooks to run then. "
@@ -1761,12 +1765,12 @@ let Command = "thread backtrace" in {
17611765
def thread_backtrace_start : Option<"start", "s">,
17621766
Group<1>,
17631767
Arg<"FrameIndex">,
1764-
Desc<"Frame in which to start the backtrace">;
1768+
Desc<"Frame in which to ${s}tart the backtrace">;
17651769
def thread_backtrace_extended
17661770
: Option<"extended", "e">,
17671771
Group<1>,
17681772
Arg<"Boolean">,
1769-
Desc<"Show the extended backtrace, if available">;
1773+
Desc<"Show the ${e}xtended backtrace, if available">;
17701774
def thread_backtrace_unfiltered : Option<"unfiltered", "u">,
17711775
Group<1>,
17721776
Desc<"Do not filter out frames according "
@@ -1810,8 +1814,8 @@ let Command = "thread step scope" in {
18101814
: Option<"step-over-regexp", "r">,
18111815
Group<1>,
18121816
Arg<"RegularExpression">,
1813-
Desc<"A regular expression that defines function names to not to stop "
1814-
"at when stepping in.">;
1817+
Desc<"A ${r}egular expression that defines function names to not to "
1818+
"stop at when stepping in.">;
18151819
def thread_step_scope_step_in_target
18161820
: Option<"step-in-target", "t">,
18171821
Group<1>,

0 commit comments

Comments
 (0)