Skip to content

Commit e50a0d6

Browse files
authored
Merge branch 'main' into himadhith/xxleqv_vec
2 parents d74869b + 8c05b5c commit e50a0d6

File tree

164 files changed

+7805
-2763
lines changed

Some content is hidden

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

164 files changed

+7805
-2763
lines changed

.ci/monolithic-linux.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ start-group "ninja"
6666

6767
# Targets are not escaped as they are passed as separate arguments.
6868
ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
69+
cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
6970

7071
if [[ "${runtime_targets}" != "" ]]; then
7172
start-group "ninja Runtimes"
7273

7374
ninja -C "${BUILD_DIR}" ${runtime_targets} |& tee ninja_runtimes.log
75+
cp ${BUILD_DIR}/.ninja_log ninja_runtimes.ninja_log
7476
fi
7577

7678
# Compiling runtimes with just-built Clang and running their tests
@@ -87,6 +89,7 @@ if [[ "${runtime_targets_needs_reconfig}" != "" ]]; then
8789

8890
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig} \
8991
|& tee ninja_runtimes_needs_reconfig1.log
92+
cp ${BUILD_DIR}/.ninja_log ninja_runtimes_needs_reconig.ninja_log
9093

9194
start-group "CMake Runtimes Clang Modules"
9295

@@ -99,4 +102,5 @@ if [[ "${runtime_targets_needs_reconfig}" != "" ]]; then
99102

100103
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig} \
101104
|& tee ninja_runtimes_needs_reconfig2.log
105+
cp ${BUILD_DIR}/.ninja_log ninja_runtimes_needs_reconfig2.ninja_log
102106
fi

.ci/monolithic-windows.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ start-group "ninja"
5555

5656
# Targets are not escaped as they are passed as separate arguments.
5757
ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
58+
cp ${BUILD_DIR}/.ninja_log ninja.ninja_log
5859

5960
if [[ "${runtime_targets}" != "" ]]; then
6061
start-group "ninja runtimes"
6162

6263
ninja -C "${BUILD_DIR}" -k 0 ${runtimes_targets} |& tee ninja_runtimes.log
64+
cp ${BUILD_DIR}/.ninja_log ninja_runtimes.ninja_log
6365
fi

.ci/premerge_advisor_upload.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ def main(commit_sha, workflow_run_number, build_log_files):
2323
)
2424
test_failures = generate_test_report_lib.get_failures(junit_objects)
2525
source = "pull_request" if "GITHUB_ACTIONS" in os.environ else "postcommit"
26+
current_platform = f"{platform.system()}-{platform.machine()}".lower()
2627
failure_info = {
2728
"source_type": source,
2829
"base_commit_sha": commit_sha,
2930
"source_id": workflow_run_number,
3031
"failures": [],
32+
"platform": current_platform,
3133
}
3234
if test_failures:
3335
for name, failure_message in test_failures:

.ci/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function at-exit {
2626
mkdir -p artifacts
2727
sccache --show-stats
2828
sccache --show-stats >> artifacts/sccache_stats.txt
29-
cp "${BUILD_DIR}"/.ninja_log artifacts/.ninja_log
29+
cp "${MONOREPO_ROOT}"/*.ninja_log artifacts/ || :
3030
cp "${MONOREPO_ROOT}"/*.log artifacts/ || :
3131
cp "${BUILD_DIR}"/test-results.*.xml artifacts/ || :
3232

clang-tools-extra/test/clang-tidy/checkers/misc/misplaced-const-cxx17.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// This test previously would cause a failed assertion because the structured
44
// binding declaration had no valid type associated with it. This ensures the
55
// expected clang diagnostic is generated instead.
6-
// CHECK-MESSAGES: :[[@LINE+1]]:6: error: decomposition declaration '[x]' requires an initializer [clang-diagnostic-error]
6+
// CHECK-MESSAGES: :[[@LINE+1]]:6: error: structured binding declaration '[x]' requires an initializer [clang-diagnostic-error]
77
auto [x];
88

99
struct S { int a; };

clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ Attribute Changes in Clang
304304

305305
Improvements to Clang's diagnostics
306306
-----------------------------------
307+
- Diagnostics messages now refer to ``structured binding`` instead of ``decomposition``,
308+
to align with `P0615R0 <https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0615r0.html>`_ changing the term. (#GH157880)
307309
- Added a separate diagnostic group ``-Wfunction-effect-redeclarations``, for the more pedantic
308310
diagnostics for function effects (``[[clang::nonblocking]]`` and ``[[clang::nonallocating]]``).
309311
Moved the warning for a missing (though implied) attribute on a redeclaration into this group.

clang/docs/analyzer/checkers.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3465,12 +3465,6 @@ Check for an out-of-bound pointer being returned to callers.
34653465
return x; // warn: undefined or garbage returned
34663466
}
34673467
3468-
3469-
alpha.security.cert
3470-
^^^^^^^^^^^^^^^^^^^
3471-
3472-
SEI CERT checkers which tries to find errors based on their `C coding rules <https://wiki.sei.cmu.edu/confluence/display/c/2+Rules>`_.
3473-
34743468
alpha.unix
34753469
^^^^^^^^^^
34763470

clang/include/clang/Basic/DiagnosticParseKinds.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ def err_expected_coloncolon_after_super : Error<
505505
"expected '::' after '__super'">;
506506

507507
def ext_decomp_decl_empty : ExtWarn<
508-
"ISO C++17 does not allow a decomposition group to be empty">,
508+
"ISO C++17 does not allow a structured binding group to be empty">,
509509
InGroup<DiagGroup<"empty-decomposition">>;
510510

511511
def err_function_parameter_limit_exceeded : Error<

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ defm constexpr_body_multiple_return : CXX14Compat<
3131
defm variable_template : CXX14Compat<"variable templates are">;
3232

3333
// C++17 compatibility with C++14 and earlier.
34-
defm decomp_decl : CXX17Compat<"decomposition declarations are">;
34+
defm decomp_decl : CXX17Compat<"structured binding declarations are">;
3535
defm inline_variable : CXX17Compat<"inline variables are">;
3636

3737
// C++20 compatibility with C++17 and earlier.
3838
defm decomp_decl_spec
39-
: CXX20Compat<"decomposition declaration declared '%0' is">;
39+
: CXX20Compat<"structured binding declaration declared '%0' is">;
4040
defm constexpr_local_var_no_init : CXX20Compat<
4141
"uninitialized variable in a constexpr %select{function|constructor}0 is">;
4242
defm constexpr_function_try_block : CXX20Compat<
@@ -591,58 +591,58 @@ def warn_modifying_shadowing_decl :
591591

592592
// C++ decomposition declarations
593593
def err_decomp_decl_context : Error<
594-
"decomposition declaration not permitted in this context">;
594+
"structured binding declaration not permitted in this context">;
595595
def err_decomp_decl_spec
596-
: Error<"decomposition declaration cannot be declared '%0'">;
596+
: Error<"structured binding declaration cannot be declared '%0'">;
597597
def err_decomp_decl_type : Error<
598-
"decomposition declaration cannot be declared with type %0; "
598+
"structured binding declaration cannot be declared with type %0; "
599599
"declared type must be 'auto' or reference to 'auto'">;
600600
def err_decomp_decl_constraint : Error<
601-
"decomposition declaration cannot be declared with constrained 'auto'">;
601+
"structured binding declaration cannot be declared with constrained 'auto'">;
602602
def err_decomp_decl_parens : Error<
603-
"decomposition declaration cannot be declared with parentheses">;
603+
"structured binding declaration cannot be declared with parentheses">;
604604
def err_decomp_decl_template : Error<
605-
"decomposition declaration cannot be a template">;
605+
"structured binding declaration cannot be a template">;
606606
def err_decomp_decl_not_alone : Error<
607-
"decomposition declaration must be the only declaration in its group">;
607+
"structured binding declaration must be the only declaration in its group">;
608608
def err_decomp_decl_requires_init : Error<
609-
"decomposition declaration %0 requires an initializer">;
609+
"structured binding declaration %0 requires an initializer">;
610610
def err_decomp_decl_wrong_number_bindings : Error<
611-
"type %0 decomposes into %3 %plural{1:element|:elements}2, but "
611+
"type %0 binds to %3 %plural{1:element|:elements}2, but "
612612
"%select{%plural{0:no|:only %1}1|%1}4 "
613613
"%plural{1:name was|:names were}1 provided">;
614614
def err_decomp_decl_unbindable_type : Error<
615-
"cannot decompose %select{union|non-class, non-array}1 type %2">;
615+
"cannot bind %select{union|non-class, non-array}1 type %2">;
616616
def err_decomp_decl_multiple_bases_with_members : Error<
617-
"cannot decompose class type %1: "
617+
"cannot bind class type %1: "
618618
"%select{its base classes %2 and|both it and its base class}0 %3 "
619619
"have non-static data members">;
620620
def err_decomp_decl_ambiguous_base : Error<
621-
"cannot decompose members of ambiguous base class %1 of %0:%2">;
621+
"cannot bind members of ambiguous base class %1 of %0:%2">;
622622
def err_decomp_decl_inaccessible_base : Error<
623-
"cannot decompose members of inaccessible base class %1 of %0">,
623+
"cannot bind members of inaccessible base class %1 of %0">,
624624
AccessControl;
625625
def err_decomp_decl_inaccessible_field : Error<
626-
"cannot decompose %select{private|protected}0 member %1 of %3">,
626+
"cannot bind %select{private|protected}0 member %1 of %3">,
627627
AccessControl;
628628
def err_decomp_decl_lambda : Error<
629-
"cannot decompose lambda closure type">;
629+
"cannot bind lambda closure type">;
630630
def err_decomp_decl_anon_union_member : Error<
631-
"cannot decompose class type %0 because it has an anonymous "
631+
"cannot bind class type %0 because it has an anonymous "
632632
"%select{struct|union}1 member">;
633633
def err_decomp_decl_std_tuple_element_not_specialized : Error<
634-
"cannot decompose this type; 'std::tuple_element<%0>::type' "
634+
"cannot bind this type; 'std::tuple_element<%0>::type' "
635635
"does not name a type">;
636636
def err_decomp_decl_std_tuple_size_not_constant : Error<
637-
"cannot decompose this type; 'std::tuple_size<%0>::value' "
637+
"cannot bind this type; 'std::tuple_size<%0>::value' "
638638
"is not a valid integral constant expression">;
639639
def err_decomp_decl_std_tuple_size_invalid
640-
: Error<"cannot decompose this type; 'std::tuple_size<%0>::value' "
640+
: Error<"cannot bind this type; 'std::tuple_size<%0>::value' "
641641
"is not a valid size: %1">;
642642
def note_in_binding_decl_init : Note<
643643
"in implicit initialization of binding declaration %0">;
644644
def err_arg_is_not_destructurable : Error<
645-
"type %0 cannot be decomposed">;
645+
"type %0 cannot be bound">;
646646

647647
def err_std_type_trait_not_class_template : Error<
648648
"unsupported standard library implementation: "
@@ -2620,7 +2620,7 @@ def err_auto_variable_cannot_appear_in_own_initializer
26202620
"declared with deduced type %2 cannot appear in its own initializer">;
26212621
def err_binding_cannot_appear_in_own_initializer : Error<
26222622
"binding %0 cannot appear in the initializer of its own "
2623-
"decomposition declaration">;
2623+
"structured binding declaration">;
26242624
def err_new_array_of_auto : Error<
26252625
"cannot allocate array of 'auto'">;
26262626
def err_auto_not_allowed : Error<

clang/include/clang/CIR/Dialect/IR/CIRAttrConstraints.td

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,32 @@ def CIR_AnyIntOrFloatAttr : AnyAttrOf<[CIR_AnyIntAttr, CIR_AnyFPAttr],
3838
string cppType = "::mlir::TypedAttr";
3939
}
4040

41+
//===----------------------------------------------------------------------===//
42+
// Exceptions constraints
43+
//===----------------------------------------------------------------------===//
44+
45+
def CIR_AnyCatchAllAttr
46+
: CIR_AttrConstraint<"::cir::CatchAllAttr", "catch all attribute">;
47+
48+
def CIR_AnyUnwindAttr
49+
: CIR_AttrConstraint<"::cir::UnwindAttr", "unwind attribute">;
50+
4151
//===----------------------------------------------------------------------===//
4252
// GlobalViewAttr constraints
4353
//===----------------------------------------------------------------------===//
4454

45-
def CIR_AnyGlobalViewAttr : CIR_AttrConstraint<"::cir::GlobalViewAttr", "GlobalView attribute">;
55+
def CIR_AnyGlobalViewAttr
56+
: CIR_AttrConstraint<"::cir::GlobalViewAttr", "GlobalView attribute">;
4657

47-
def CIR_AnyIntOrGlobalViewAttr : AnyAttrOf<[CIR_AnyIntAttr, CIR_AnyGlobalViewAttr],
48-
"integer or global view attribute"> {
58+
def CIR_AnyIntOrGlobalViewAttr
59+
: AnyAttrOf<[CIR_AnyIntAttr, CIR_AnyGlobalViewAttr],
60+
"integer or global view attribute"> {
61+
string cppType = "::mlir::TypedAttr";
62+
}
63+
64+
def CIR_TryHandlerAttr
65+
: AnyAttrOf<[CIR_AnyGlobalViewAttr, CIR_AnyCatchAllAttr, CIR_AnyUnwindAttr],
66+
"catch all or unwind or global view attribute"> {
4967
string cppType = "::mlir::TypedAttr";
5068
}
5169

@@ -61,4 +79,7 @@ def CIR_IntOrGlobalViewArrayAttr : TypedArrayAttrBase<CIR_AnyIntOrGlobalViewAttr
6179
string cppType = "::mlir::ArrayAttr";
6280
}
6381

64-
#endif // CLANG_CIR_DIALECT_IR_CIRATTRCONSTRAINTS_TD
82+
def CIR_TryHandlerArrayAttr : TypedArrayAttrBase<CIR_TryHandlerAttr,
83+
"catch all or unwind or global view array attribute">;
84+
85+
#endif // CLANG_CIR_DIALECT_IR_CIRATTRCONSTRAINTS_TD

0 commit comments

Comments
 (0)