Skip to content

Commit de84a3e

Browse files
author
Valery N Dmitriev
committed
Merge from 'master' to 'sycl-web' (#3)
CONFLICT (content): Merge conflict in clang/include/clang/Basic/DiagnosticSemaKinds.td
2 parents 0dea41a + 22f02db commit de84a3e

File tree

1,316 files changed

+34531
-9712
lines changed

Some content is hidden

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

1,316 files changed

+34531
-9712
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,8 @@ autoconf/autom4te.cache
5656
.vs
5757
# clangd index
5858
.clangd
59+
# static analyzer regression testing project files
60+
/clang/utils/analyzer/projects/*/CachedSource
61+
/clang/utils/analyzer/projects/*/PatchedSource
62+
/clang/utils/analyzer/projects/*/ScanBuildResults
63+
/clang/utils/analyzer/projects/*/RefScanBuildResults

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set(LLVM_LINK_COMPONENTS
55

66
add_clang_library(clangChangeNamespace
77
ChangeNamespace.cpp
8+
9+
DEPENDS
10+
omp_gen
811
)
912

1013
clang_target_link_libraries(clangChangeNamespace

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ add_clang_library(clangDoc
1515
Representation.cpp
1616
Serialize.cpp
1717
YAMLGenerator.cpp
18+
19+
DEPENDS
20+
omp_gen
1821
)
1922

2023
clang_target_link_libraries(clangDoc

clang-tools-extra/clang-include-fixer/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ add_clang_library(clangIncludeFixer
1212

1313
LINK_LIBS
1414
findAllSymbols
15+
16+
DEPENDS
17+
omp_gen
1518
)
1619

1720
clang_target_link_libraries(clangIncludeFixer

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ add_clang_library(findAllSymbols
1212
PragmaCommentHandler.cpp
1313
STLPostfixHeaderMap.cpp
1414
SymbolInfo.cpp
15+
16+
DEPENDS
17+
omp_gen
1518
)
1619

1720
clang_target_link_libraries(findAllSymbols

clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ add_clang_library(clangIncludeFixerPlugin
1010
clangSema
1111
clangTooling
1212
${LLVM_PTHREAD_LIB}
13+
14+
DEPENDS
15+
omp_gen
1316
)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ set(LLVM_LINK_COMPONENTS
66
add_clang_library(clangMove
77
Move.cpp
88
HelperDeclRefGraph.cpp
9+
10+
DEPENDS
11+
omp_gen
912
)
1013

1114
clang_target_link_libraries(clangMove

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ set(LLVM_LINK_COMPONENTS
77
add_clang_library(clangQuery
88
Query.cpp
99
QueryParser.cpp
10+
11+
DEPENDS
12+
omp_gen
1013
)
1114

1215
clang_target_link_libraries(clangQuery

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set(LLVM_LINK_COMPONENTS
55

66
add_clang_library(clangReorderFields
77
ReorderFieldsAction.cpp
8+
9+
DEPENDS
10+
omp_gen
811
)
912

1013
clang_target_link_libraries(clangReorderFields

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ add_clang_library(clangTidy
1515

1616
DEPENDS
1717
ClangSACheckers
18+
omp_gen
1819
)
1920

2021
clang_target_link_libraries(clangTidy

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ add_clang_library(clangTidyAbseilModule
2828
LINK_LIBS
2929
clangTidy
3030
clangTidyUtils
31+
32+
DEPENDS
33+
omp_gen
3134
)
3235

3336
clang_target_link_libraries(clangTidyAbseilModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ add_clang_library(clangTidyAndroidModule
2525
LINK_LIBS
2626
clangTidy
2727
clangTidyUtils
28+
29+
DEPENDS
30+
omp_gen
2831
)
2932

3033
clang_target_link_libraries(clangTidyAndroidModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ add_clang_library(clangTidyBoostModule
1010
LINK_LIBS
1111
clangTidy
1212
clangTidyUtils
13+
14+
DEPENDS
15+
omp_gen
1316
)
1417

1518
clang_target_link_libraries(clangTidyBoostModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ add_clang_library(clangTidyBugproneModule
6262
clangTidy
6363
clangTidyCppCoreGuidelinesModule
6464
clangTidyUtils
65+
66+
DEPENDS
67+
omp_gen
6568
)
6669

6770
clang_target_link_libraries(clangTidyBugproneModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ add_clang_library(clangTidyCERTModule
2828
clangTidyPerformanceModule
2929
clangTidyReadabilityModule
3030
clangTidyUtils
31+
32+
DEPENDS
33+
omp_gen
3134
)
3235

3336
clang_target_link_libraries(clangTidyCERTModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ add_clang_library(clangTidyCppCoreGuidelinesModule
3232
clangTidyModernizeModule
3333
clangTidyReadabilityModule
3434
clangTidyUtils
35+
36+
DEPENDS
37+
omp_gen
3538
)
3639

3740
clang_target_link_libraries(clangTidyCppCoreGuidelinesModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ add_clang_library(clangTidyDarwinModule
1111
LINK_LIBS
1212
clangTidy
1313
clangTidyUtils
14+
15+
DEPENDS
16+
omp_gen
1417
)
1518

1619
clang_target_link_libraries(clangTidyDarwinModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ add_clang_library(clangTidyFuchsiaModule
1717
clangTidy
1818
clangTidyGoogleModule
1919
clangTidyUtils
20+
21+
DEPENDS
22+
omp_gen
2023
)
2124

2225
clang_target_link_libraries(clangTidyFuchsiaModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ add_clang_library(clangTidyGoogleModule
2727
clangTidy
2828
clangTidyReadabilityModule
2929
clangTidyUtils
30+
31+
DEPENDS
32+
omp_gen
3033
)
3134

3235
clang_target_link_libraries(clangTidyGoogleModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ add_clang_library(clangTidyHICPPModule
2020
clangTidyPerformanceModule
2121
clangTidyReadabilityModule
2222
clangTidyUtils
23+
24+
DEPENDS
25+
omp_gen
2326
)
2427

2528
clang_target_link_libraries(clangTidyHICPPModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ add_clang_library(clangTidyLinuxKernelModule
1010
LINK_LIBS
1111
clangTidy
1212
clangTidyUtils
13+
14+
DEPENDS
15+
omp_gen
1316
)
1417

1518
clang_target_link_libraries(clangTidyLinuxKernelModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ add_clang_library(clangTidyLLVMModule
1515
clangTidy
1616
clangTidyReadabilityModule
1717
clangTidyUtils
18+
19+
DEPENDS
20+
omp_gen
1821
)
1922

2023
clang_target_link_libraries(clangTidyLLVMModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ add_clang_library(clangTidyLLVMLibcModule
1313
clangTidy
1414
clangTidyPortabilityModule
1515
clangTidyUtils
16+
17+
DEPENDS
18+
omp_gen
1619
)
1720

1821
clang_target_link_libraries(clangTidyLLVMLibcModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ add_clang_library(clangTidyMiscModule
2323
LINK_LIBS
2424
clangTidy
2525
clangTidyUtils
26+
27+
DEPENDS
28+
omp_gen
2629
)
2730

2831
clang_target_link_libraries(clangTidyMiscModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ add_clang_library(clangTidyModernizeModule
4343
clangTidy
4444
clangTidyReadabilityModule
4545
clangTidyUtils
46+
47+
DEPENDS
48+
omp_gen
4649
)
4750

4851
clang_target_link_libraries(clangTidyModernizeModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ add_clang_library(clangTidyMPIModule
1111
LINK_LIBS
1212
clangTidy
1313
clangTidyUtils
14+
15+
DEPENDS
16+
omp_gen
1417
)
1518

1619
clang_target_link_libraries(clangTidyMPIModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ add_clang_library(clangTidyObjCModule
1616
LINK_LIBS
1717
clangTidy
1818
clangTidyUtils
19+
20+
DEPENDS
21+
omp_gen
1922
)
2023

2124
clang_target_link_libraries(clangTidyObjCModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ add_clang_library(clangTidyOpenMPModule
1111
LINK_LIBS
1212
clangTidy
1313
clangTidyUtils
14+
15+
DEPENDS
16+
omp_gen
1417
)
1518

1619
clang_target_link_libraries(clangTidyOpenMPModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ add_clang_library(clangTidyPerformanceModule
2323
LINK_LIBS
2424
clangTidy
2525
clangTidyUtils
26+
27+
DEPENDS
28+
omp_gen
2629
)
2730

2831
clang_target_link_libraries(clangTidyPerformanceModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ add_clang_library(clangTidyPlugin
44
LINK_LIBS
55
clangTidy
66
${ALL_CLANG_TIDY_CHECKS}
7+
8+
DEPENDS
9+
omp_gen
710
)
811

912
clang_target_link_libraries(clangTidyPlugin

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ add_clang_library(clangTidyPortabilityModule
1111
LINK_LIBS
1212
clangTidy
1313
clangTidyUtils
14+
15+
DEPENDS
16+
omp_gen
1417
)
1518

1619
clang_target_link_libraries(clangTidyPortabilityModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ add_clang_library(clangTidyReadabilityModule
4747
LINK_LIBS
4848
clangTidy
4949
clangTidyUtils
50+
51+
DEPENDS
52+
omp_gen
5053
)
5154

5255
clang_target_link_libraries(clangTidyReadabilityModule

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ add_clang_library(clangTidyMain
1515
LINK_LIBS
1616
clangTidy
1717
${ALL_CLANG_TIDY_CHECKS}
18+
19+
DEPENDS
20+
omp_gen
1821
)
1922

2023
clang_target_link_libraries(clangTidyMain

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ add_clang_library(clangTidyUtils
2323

2424
LINK_LIBS
2525
clangTidy
26+
27+
DEPENDS
28+
omp_gen
2629
)
2730

2831
clang_target_link_libraries(clangTidyUtils

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ add_clang_library(clangTidyZirconModule
1010
LINK_LIBS
1111
clangTidy
1212
clangTidyUtils
13+
14+
DEPENDS
15+
omp_gen
1316
)
1417

1518
clang_target_link_libraries(clangTidyZirconModule

clang-tools-extra/clangd/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ add_clang_library(clangDaemon
100100
clangTidy
101101
${LLVM_PTHREAD_LIB}
102102
${ALL_CLANG_TIDY_CHECKS}
103+
104+
DEPENDS
105+
omp_gen
103106
)
104107

105108
clang_target_link_libraries(clangDaemon

clang-tools-extra/clangd/Hover.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,10 @@ llvm::Optional<std::string> printExprValue(const Expr *E,
341341
T->isFunctionReferenceType())
342342
return llvm::None;
343343
// Attempt to evaluate. If expr is dependent, evaluation crashes!
344-
if (E->isValueDependent() || !E->EvaluateAsRValue(Constant, Ctx))
344+
if (E->isValueDependent() || !E->EvaluateAsRValue(Constant, Ctx) ||
345+
// Disable printing for record-types, as they are usually confusing and
346+
// might make clang crash while printing the expressions.
347+
Constant.Val.isStruct() || Constant.Val.isUnion())
345348
return llvm::None;
346349

347350
// Show enums symbolically, not numerically like APValue::printPretty().
@@ -353,7 +356,7 @@ llvm::Optional<std::string> printExprValue(const Expr *E,
353356
if (ECD->getInitVal() == Val)
354357
return llvm::formatv("{0} ({1})", ECD->getNameAsString(), Val).str();
355358
}
356-
return Constant.Val.getAsString(Ctx, E->getType());
359+
return Constant.Val.getAsString(Ctx, T);
357360
}
358361

359362
llvm::Optional<std::string> printExprValue(const SelectionTree::Node *N,

clang-tools-extra/clangd/index/Background.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,9 @@ BackgroundIndex::BackgroundIndex(
103103
CDB.watch([&](const std::vector<std::string> &ChangedFiles) {
104104
enqueue(ChangedFiles);
105105
})) {
106-
assert(Rebuilder.TUsBeforeFirstBuild > 0 &&
107-
"Thread pool size can't be zero.");
106+
assert(ThreadPoolSize > 0 && "Thread pool size can't be zero.");
108107
assert(this->IndexStorageFactory && "Storage factory can not be null!");
109-
for (unsigned I = 0; I < Rebuilder.TUsBeforeFirstBuild; ++I) {
108+
for (unsigned I = 0; I < ThreadPoolSize; ++I) {
110109
ThreadPool.runAsync("background-worker-" + llvm::Twine(I + 1), [this] {
111110
WithContext Ctx(this->BackgroundContext.clone());
112111
Queue.work([&] { Rebuilder.idle(); });

clang-tools-extra/clangd/index/Background.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ class BackgroundIndex : public SwapIndex {
135135
Context BackgroundContext, const ThreadsafeFS &,
136136
const GlobalCompilationDatabase &CDB,
137137
BackgroundIndexStorage::Factory IndexStorageFactory,
138-
size_t ThreadPoolSize = 0, // 0 = use all hardware threads
138+
// Arbitrary value to ensure some concurrency in tests.
139+
// In production an explicit value is passed.
140+
size_t ThreadPoolSize = 4,
139141
std::function<void(BackgroundQueue::Stats)> OnProgress = nullptr);
140142
~BackgroundIndex(); // Blocks while the current task finishes.
141143

0 commit comments

Comments
 (0)