Skip to content

Commit 585dd68

Browse files
committed
Merge from 'master' to 'sycl-web' (#59)
CONFLICT (content): Merge conflict in README.md
2 parents 5d1d2ba + 59dd625 commit 585dd68

File tree

503 files changed

+7116
-7832
lines changed

Some content is hidden

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

503 files changed

+7116
-7832
lines changed

clang-tools-extra/clang-change-namespace/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(LLVM_LINK_COMPONENTS
2-
support
2+
FrontendOpenMP
3+
Support
34
)
45

56
add_clang_library(clangChangeNamespace

clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
22

33
set(LLVM_LINK_COMPONENTS
4+
FrontendOpenMP
45
Support
56
)
67

clang-tools-extra/clang-doc/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set(LLVM_LINK_COMPONENTS
22
support
33
BitstreamReader
4+
FrontendOpenMP
45
)
56

67
add_clang_library(clangDoc

clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(LLVM_LINK_COMPONENTS
22
Support
3+
FrontendOpenMP
34
)
45

56
add_clang_library(findAllSymbols

clang-tools-extra/clang-move/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(LLVM_LINK_COMPONENTS
22
support
3+
FrontendOpenMP
34
)
45

56
add_clang_library(clangMove

clang-tools-extra/clang-query/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set(LLVM_LINK_COMPONENTS
22
lineeditor
33
support
4+
FrontendOpenMP
45
)
56

67
add_clang_library(clangQuery

clang-tools-extra/clang-reorder-fields/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(LLVM_LINK_COMPONENTS
2+
FrontendOpenMP
23
support
34
)
45

clang-tools-extra/clang-tidy/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(LLVM_LINK_COMPONENTS
2+
FrontendOpenMP
23
Support
34
)
45

clang-tools-extra/clang-tidy/ClangTidyCheck.h

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -312,41 +312,6 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
312312
return Default;
313313
}
314314

315-
/// Read a named option from the ``Context`` and parse it as a bool.
316-
///
317-
/// Reads the option with the check-local name \p LocalName from the
318-
/// ``CheckOptions``. If the corresponding key is not present, returns
319-
/// a ``MissingOptionError``. If the corresponding key can't be parsed as
320-
/// a bool, return an ``UnparseableIntegerOptionError``.
321-
template <> llvm::Expected<bool> get<bool>(StringRef LocalName) const;
322-
323-
/// Read a named option from the ``Context`` and parse it as a bool.
324-
///
325-
/// Reads the option with the check-local name \p LocalName from the
326-
/// ``CheckOptions``. If the corresponding key is not present or it can't be
327-
/// parsed as a bool, returns \p Default.
328-
template <> bool get<bool>(StringRef LocalName, bool Default) const;
329-
330-
/// Read a named option from the ``Context`` and parse it as a bool.
331-
///
332-
/// Reads the option with the check-local name \p LocalName from local or
333-
/// global ``CheckOptions``. Gets local option first. If local is not
334-
/// present, falls back to get global option. If global option is not
335-
/// present either, returns a ``MissingOptionError``. If the corresponding
336-
/// key can't be parsed as a bool, return an
337-
/// ``UnparseableIntegerOptionError``.
338-
template <>
339-
llvm::Expected<bool> getLocalOrGlobal<bool>(StringRef LocalName) const;
340-
341-
/// Read a named option from the ``Context`` and parse it as a bool.
342-
///
343-
/// Reads the option with the check-local name \p LocalName from local or
344-
/// global ``CheckOptions``. Gets local option first. If local is not
345-
/// present, falls back to get global option. If global option is not
346-
/// present either or it can't be parsed as a bool, returns \p Default.
347-
template <>
348-
bool getLocalOrGlobal<bool>(StringRef LocalName, bool Default) const;
349-
350315
/// Read a named option from the ``Context`` and parse it as an
351316
/// enum type ``T`` using the \p Mapping provided. If \p IgnoreCase is set,
352317
/// it will search the mapping ignoring the case.
@@ -488,6 +453,47 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback {
488453
const LangOptions &getLangOpts() const { return Context->getLangOpts(); }
489454
};
490455

456+
/// Read a named option from the ``Context`` and parse it as a bool.
457+
///
458+
/// Reads the option with the check-local name \p LocalName from the
459+
/// ``CheckOptions``. If the corresponding key is not present, returns
460+
/// a ``MissingOptionError``. If the corresponding key can't be parsed as
461+
/// a bool, return an ``UnparseableIntegerOptionError``.
462+
template <>
463+
llvm::Expected<bool>
464+
ClangTidyCheck::OptionsView::get<bool>(StringRef LocalName) const;
465+
466+
/// Read a named option from the ``Context`` and parse it as a bool.
467+
///
468+
/// Reads the option with the check-local name \p LocalName from the
469+
/// ``CheckOptions``. If the corresponding key is not present or it can't be
470+
/// parsed as a bool, returns \p Default.
471+
template <>
472+
bool ClangTidyCheck::OptionsView::get<bool>(StringRef LocalName,
473+
bool Default) const;
474+
475+
/// Read a named option from the ``Context`` and parse it as a bool.
476+
///
477+
/// Reads the option with the check-local name \p LocalName from local or
478+
/// global ``CheckOptions``. Gets local option first. If local is not
479+
/// present, falls back to get global option. If global option is not
480+
/// present either, returns a ``MissingOptionError``. If the corresponding
481+
/// key can't be parsed as a bool, return an
482+
/// ``UnparseableIntegerOptionError``.
483+
template <>
484+
llvm::Expected<bool>
485+
ClangTidyCheck::OptionsView::getLocalOrGlobal<bool>(StringRef LocalName) const;
486+
487+
/// Read a named option from the ``Context`` and parse it as a bool.
488+
///
489+
/// Reads the option with the check-local name \p LocalName from local or
490+
/// global ``CheckOptions``. Gets local option first. If local is not
491+
/// present, falls back to get global option. If global option is not
492+
/// present either or it can't be parsed as a bool, returns \p Default.
493+
template <>
494+
bool ClangTidyCheck::OptionsView::getLocalOrGlobal<bool>(StringRef LocalName,
495+
bool Default) const;
496+
491497
} // namespace tidy
492498
} // namespace clang
493499

clang-tools-extra/clang-tidy/abseil/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
set(LLVM_LINK_COMPONENTS support)
1+
set(LLVM_LINK_COMPONENTS
2+
support
3+
FrontendOpenMP
4+
)
25

36
add_clang_library(clangTidyAbseilModule
47
AbseilTidyModule.cpp

0 commit comments

Comments
 (0)