Skip to content

Commit 8a854c2

Browse files
authored
Merge branch 'main' into uses_allocator_syntax
2 parents e54597e + 7b6db76 commit 8a854c2

File tree

401 files changed

+7775
-3307
lines changed

Some content is hidden

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

401 files changed

+7775
-3307
lines changed

.github/workflows/gha-codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
pull_request:
88
branches:
99
- main
10+
paths:
11+
- '.github/**'
1012
schedule:
1113
- cron: '30 0 * * *'
1214

.github/workflows/libclang-abi-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ jobs:
113113
./configure
114114
sudo make install
115115
- name: Download source code
116-
uses: llvm/actions/get-llvm-project-src@main
116+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
117117
with:
118118
ref: ${{ matrix.ref }}
119-
repo: ${{ matrix.repo }}
119+
repository: ${{ matrix.repo }}
120120
- name: Configure
121121
run: |
122122
mkdir install

.github/workflows/llvm-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ jobs:
101101
./configure
102102
sudo make install
103103
- name: Download source code
104-
uses: llvm/actions/get-llvm-project-src@main
104+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
105105
with:
106106
ref: ${{ matrix.ref }}
107-
repo: ${{ matrix.repo }}
107+
repository: ${{ matrix.repo }}
108108
- name: Configure
109109
run: |
110110
mkdir install

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
1+
// RUN: %check_clang_tidy %s --extra-arg=-Wno-error=incompatible-pointer-types bugprone-easily-swappable-parameters %t \
22
// RUN: -config='{CheckOptions: { \
33
// RUN: bugprone-easily-swappable-parameters.MinimumLength: 2, \
44
// RUN: bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \

clang/cmake/modules/ClangConfig.cmake.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ set(CLANG_EXPORTED_TARGETS "@CLANG_EXPORTS@")
1010
set(CLANG_CMAKE_DIR "@CLANG_CONFIG_CMAKE_DIR@")
1111
set(CLANG_INCLUDE_DIRS "@CLANG_CONFIG_INCLUDE_DIRS@")
1212
set(CLANG_LINK_CLANG_DYLIB "@CLANG_LINK_CLANG_DYLIB@")
13+
set(CLANG_DEFAULT_LINKER "@CLANG_DEFAULT_LINKER@")
1314

1415
# Provide all our library targets to users.
1516
@CLANG_CONFIG_INCLUDE_EXPORTS@

clang/docs/OpenMPSupport.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ and their implementation status. Please post on the
359359
information or if you want to help with the
360360
implementation.
361361

362+
362363
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
363364
|Feature | C/C++ Status | Fortran Status | Reviews |
364365
+=============================================================+===========================+===========================+==========================================================================+
@@ -405,6 +406,7 @@ implementation.
405406
| dispatch construct extension to support end directive | :none:`N/A` | :none:`unclaimed` | |
406407
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
407408

409+
408410
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
409411
|OpenMP 5.2 Deprecations | C/C++ Status | Fortran Status | Reviews |
410412
+=============================================================+===========================+===========================+==========================================================================+
@@ -444,6 +446,7 @@ and their implementation status. Please post on the
444446
information or if you want to help with the
445447
implementation.
446448

449+
447450
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
448451
|Feature | C/C++ Status | Fortran Status | Reviews |
449452
+=============================================================+===========================+===========================+==========================================================================+
@@ -580,7 +583,8 @@ implementation.
580583
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
581584
| Changes to omp_target_is_accessible | :part:`In Progress` | :part:`In Progress` | |
582585
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
583-
586+
| defaultmap implicit-behavior 'storage' | :good:`done` | :none:`unclaimed` | https://github.com/llvm/llvm-project/pull/158336 |
587+
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
584588

585589
.. _OpenMP 6.1 implementation details:
586590

clang/docs/ReleaseNotes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ C/C++ Language Potentially Breaking Changes
5858

5959
- The ``__has_builtin`` function now only considers the currently active target when being used with target offloading.
6060

61+
- The ``-Wincompatible-pointer-types`` diagnostic now defaults to an error;
62+
it can still be downgraded to a warning by passing ``-Wno-error=incompatible-pointer-types``. (#GH74605)
63+
6164
C++ Specific Potentially Breaking Changes
6265
-----------------------------------------
6366
- For C++20 modules, the Reduced BMI mode will be the default option. This may introduce
@@ -525,6 +528,7 @@ OpenMP Support
525528
- Properly handle array section/assumed-size array privatization in C/C++.
526529
- Added support to handle new syntax of the ``uses_allocators`` clause.
527530
- Added support for ``variable-category`` modifier in ``default clause``.
531+
- Added support for ``defaultmap`` directive implicit-behavior ``storage``.
528532

529533
Improvements
530534
^^^^^^^^^^^^

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9048,7 +9048,7 @@ def ext_typecheck_convert_incompatible_pointer : ExtWarn<
90489048
"; take the address with &|"
90499049
"; remove *|"
90509050
"; remove &}3">,
9051-
InGroup<IncompatiblePointerTypes>;
9051+
InGroup<IncompatiblePointerTypes>, DefaultError;
90529052
def err_typecheck_convert_incompatible_pointer : Error<
90539053
"incompatible pointer types "
90549054
"%select{%diff{assigning to $ from $|assigning to different types}0,1"

clang/include/clang/Basic/OpenMPKinds.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ OPENMP_DEFAULTMAP_MODIFIER(firstprivate)
137137
OPENMP_DEFAULTMAP_MODIFIER(none)
138138
OPENMP_DEFAULTMAP_MODIFIER(default)
139139
OPENMP_DEFAULTMAP_MODIFIER(present)
140+
OPENMP_DEFAULTMAP_MODIFIER(storage)
140141

141142
// Static attributes for 'depend' clause.
142143
OPENMP_DEPEND_KIND(in)

clang/include/clang/Driver/Options.td

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4682,8 +4682,10 @@ def gdbx : Flag<["-"], "gdbx">, Group<gTune_Group>;
46824682
// Equivalent to our default dwarf version. Forces usual dwarf emission when
46834683
// CodeView is enabled.
46844684
def gdwarf : Flag<["-"], "gdwarf">, Group<g_Group>,
4685-
Visibility<[ClangOption, CLOption, DXCOption]>,
4685+
Visibility<[ClangOption, CLOption, DXCOption, FlangOption]>,
46864686
HelpText<"Generate source-level debug information with the default dwarf version">;
4687+
4688+
let Visibility = [ClangOption, FlangOption] in {
46874689
def gdwarf_2 : Flag<["-"], "gdwarf-2">, Group<g_Group>,
46884690
HelpText<"Generate source-level debug information with dwarf version 2">;
46894691
def gdwarf_3 : Flag<["-"], "gdwarf-3">, Group<g_Group>,
@@ -4692,6 +4694,7 @@ def gdwarf_4 : Flag<["-"], "gdwarf-4">, Group<g_Group>,
46924694
HelpText<"Generate source-level debug information with dwarf version 4">;
46934695
def gdwarf_5 : Flag<["-"], "gdwarf-5">, Group<g_Group>,
46944696
HelpText<"Generate source-level debug information with dwarf version 5">;
4697+
}
46954698
def gdwarf64 : Flag<["-"], "gdwarf64">, Group<g_Group>,
46964699
Visibility<[ClangOption, CC1Option, CC1AsOption]>,
46974700
HelpText<"Enables DWARF64 format for ELF binaries, if debug information emission is enabled.">,
@@ -7633,6 +7636,8 @@ def debug_info_kind_EQ : Joined<["-"], "debug-info-kind=">;
76337636
def record_command_line : Separate<["-"], "record-command-line">,
76347637
HelpText<"The string to embed in the .LLVM.command.line section.">,
76357638
MarshallingInfoString<CodeGenOpts<"RecordCommandLine">>;
7639+
def dwarf_version_EQ : Joined<["-"], "dwarf-version=">,
7640+
MarshallingInfoInt<CodeGenOpts<"DwarfVersion">>;
76367641

76377642
} // let Visibility = [CC1Option, CC1AsOption, FC1Option]
76387643

@@ -7644,8 +7649,6 @@ def debug_info_macro : Flag<["-"], "debug-info-macro">,
76447649
def default_function_attr : Separate<["-"], "default-function-attr">,
76457650
HelpText<"Apply given attribute to all functions">,
76467651
MarshallingInfoStringVector<CodeGenOpts<"DefaultFunctionAttrs">>;
7647-
def dwarf_version_EQ : Joined<["-"], "dwarf-version=">,
7648-
MarshallingInfoInt<CodeGenOpts<"DwarfVersion">>;
76497652
def debugger_tuning_EQ : Joined<["-"], "debugger-tuning=">,
76507653
Values<"gdb,lldb,sce,dbx">,
76517654
NormalizedValuesScope<"llvm::DebuggerKind">, NormalizedValues<["GDB", "LLDB", "SCE", "DBX"]>,

0 commit comments

Comments
 (0)