Skip to content

Commit 2052d6e

Browse files
nkcsgexinkcsgexi
committed
---
yaml --- r: 349214 b: refs/heads/master-next c: 7ba1595 h: refs/heads/master
1 parent 69d0d48 commit 2052d6e

File tree

314 files changed

+2036
-2374
lines changed

Some content is hidden

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

314 files changed

+2036
-2374
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: 7fd05165cde7fa05d099c6f4489cf4c692c5a579
3+
refs/heads/master-next: 7ba1595baf55a3e10109edcddb0fb266de1ef543
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/cmake/modules/SwiftSource.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,6 @@ function(_compile_swift_files
326326
set(sib_file "${module_base}.Onone.sib")
327327
set(sibopt_file "${module_base}.O.sib")
328328
set(sibgen_file "${module_base}.sibgen")
329-
list(APPEND swift_module_flags
330-
"-emit-module-source-info-path" "${source_info_file}")
331329

332330
if(SWIFT_ENABLE_MODULE_INTERFACES)
333331
set(interface_file "${module_base}.swiftinterface")
@@ -501,6 +499,7 @@ function(_compile_swift_files
501499
COMMAND
502500
"${PYTHON_EXECUTABLE}" "${line_directive_tool}" "@${file_path}" --
503501
"${swift_compiler_tool}" "-emit-module" "-o" "${module_file}"
502+
"-emit-module-source-info-path" "${source_info_file}"
504503
${swift_flags} ${swift_module_flags} "@${file_path}"
505504
${command_touch_module_outputs}
506505
OUTPUT ${module_outputs}

‎branches/master-next/cmake/modules/SwiftXcodeSupport.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ macro(swift_common_xcode_cxx_config)
100100
# Force usage of Clang.
101101
set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0"
102102
CACHE STRING "Xcode Compiler")
103-
# Use C++'14.
104-
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14"
103+
# Use C++'11.
104+
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
105105
CACHE STRING "Xcode C++ Language Standard")
106106
# Use libc++.
107107
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"

‎branches/master-next/include/swift/AST/ASTNode.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ namespace swift {
3636
enum class DeclKind : uint8_t;
3737
enum class StmtKind;
3838

39-
struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
39+
struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
4040
// Inherit the constructors from PointerUnion.
41-
using PointerUnion::PointerUnion;
42-
41+
using PointerUnion3::PointerUnion3;
42+
4343
SourceRange getSourceRange() const;
4444

4545
/// Return the location of the start of the statement.

‎branches/master-next/include/swift/AST/Decl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4785,7 +4785,7 @@ class VarDecl : public AbstractStorageDecl {
47854785
};
47864786

47874787
protected:
4788-
PointerUnion<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
4788+
PointerUnion3<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
47894789

47904790
VarDecl(DeclKind kind, bool isStatic, Introducer introducer,
47914791
bool issCaptureList, SourceLoc nameLoc, Identifier name,

‎branches/master-next/include/swift/AST/DiagnosticsClangImporter.def

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ WARNING(implicit_bridging_header_imported_from_module,none,
9191
"is deprecated and will be removed in a later version of Swift",
9292
(StringRef, Identifier))
9393

94+
WARNING(clang_vfs_overlay_is_ignored,none,
95+
"ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
96+
"'-vfsoverlay'", ())
97+
9498
#ifndef DIAG_NO_UNDEF
9599
# if defined(DIAG)
96100
# undef DIAG

‎branches/master-next/include/swift/AST/Evaluator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class Evaluator {
260260
// Check for a cycle.
261261
if (checkDependency(getCanonicalRequest(request))) {
262262
return llvm::Error(
263-
std::make_unique<CyclicalRequestError<Request>>(request, *this));
263+
llvm::make_unique<CyclicalRequestError<Request>>(request, *this));
264264
}
265265

266266
// Make sure we remove this from the set of active requests once we're

‎branches/master-next/include/swift/AST/GenericSignatureBuilder.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ class GenericSignatureBuilder {
9292
class ResolvedType;
9393

9494
using UnresolvedRequirementRHS =
95-
llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
95+
llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
9696

9797
using RequirementRHS =
98-
llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
98+
llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
9999

100100
/// The location of a requirement as written somewhere in the source.
101101
typedef llvm::PointerUnion<const TypeRepr *, const RequirementRepr *>
@@ -1373,8 +1373,8 @@ class GenericSignatureBuilder::FloatingRequirementSource {
13731373
} kind;
13741374

13751375
using Storage =
1376-
llvm::PointerUnion<const RequirementSource *, const TypeRepr *,
1377-
const RequirementRepr *>;
1376+
llvm::PointerUnion3<const RequirementSource *, const TypeRepr *,
1377+
const RequirementRepr *>;
13781378

13791379
Storage storage;
13801380

‎branches/master-next/include/swift/AST/ModuleLoader.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#include "llvm/ADT/SmallSet.h"
2525
#include "llvm/ADT/TinyPtrVector.h"
2626

27-
namespace llvm {
28-
class FileCollector;
29-
}
30-
3127
namespace clang {
3228
class DependencyCollector;
3329
}
@@ -58,9 +54,8 @@ enum class Bridgeability : unsigned {
5854
class DependencyTracker {
5955
std::shared_ptr<clang::DependencyCollector> clangCollector;
6056
public:
61-
explicit DependencyTracker(
62-
bool TrackSystemDeps,
63-
std::shared_ptr<llvm::FileCollector> FileCollector = {});
57+
58+
explicit DependencyTracker(bool TrackSystemDeps);
6459

6560
/// Adds a file as a dependency.
6661
///

‎branches/master-next/include/swift/AST/SimpleRequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class SimpleRequest<Derived, Output(Inputs...), Caching> {
195195

196196
template<size_t ...Indices>
197197
llvm::Expected<Output>
198-
callDerived(Evaluator &evaluator, std::index_sequence<Indices...>) const {
198+
callDerived(Evaluator &evaluator, llvm::index_sequence<Indices...>) const {
199199
static_assert(sizeof...(Indices) > 0, "Subclass must define evaluate()");
200200
return asDerived().evaluate(evaluator, std::get<Indices>(storage)...);
201201
}
@@ -217,7 +217,7 @@ class SimpleRequest<Derived, Output(Inputs...), Caching> {
217217
static llvm::Expected<OutputType>
218218
evaluateRequest(const Derived &request, Evaluator &evaluator) {
219219
return request.callDerived(evaluator,
220-
std::index_sequence_for<Inputs...>());
220+
llvm::index_sequence_for<Inputs...>());
221221
}
222222

223223
/// Retrieve the nearest source location to which this request applies.

‎branches/master-next/include/swift/AST/TypeCheckRequests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ struct WhereClauseOwner {
366366

367367
/// The source of the where clause, which can be a generic parameter list
368368
/// or a declaration that can have a where clause.
369-
llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
369+
llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
370370

371371
WhereClauseOwner(Decl *decl);
372372

‎branches/master-next/include/swift/Basic/LLVM.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ namespace llvm {
4242
template<typename T> class MutableArrayRef;
4343
template<typename T> class TinyPtrVector;
4444
template<typename T> class Optional;
45-
template <typename ...PTs> class PointerUnion;
45+
template <typename PT1, typename PT2> class PointerUnion;
46+
template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
4647
class SmallBitVector;
4748

4849
// Other common classes.
@@ -67,6 +68,7 @@ namespace swift {
6768
using llvm::None;
6869
using llvm::Optional;
6970
using llvm::PointerUnion;
71+
using llvm::PointerUnion3;
7072
using llvm::SmallBitVector;
7173
using llvm::SmallPtrSet;
7274
using llvm::SmallPtrSetImpl;

‎branches/master-next/include/swift/ClangImporter/ClangImporter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
namespace llvm {
2525
class Triple;
26-
class FileCollector;
2726
template<typename Fn> class function_ref;
2827
}
2928

@@ -150,8 +149,7 @@ class ClangImporter final : public ClangModuleLoader {
150149
/// Create a new clang::DependencyCollector customized to
151150
/// ClangImporter's specific uses.
152151
static std::shared_ptr<clang::DependencyCollector>
153-
createDependencyCollector(bool TrackSystemDeps,
154-
std::shared_ptr<llvm::FileCollector> FileCollector);
152+
createDependencyCollector(bool TrackSystemDeps);
155153

156154
/// Append visible module names to \p names. Note that names are possibly
157155
/// duplicated, and not guaranteed to be ordered in any way.

‎branches/master-next/include/swift/ClangImporter/ClangImporterOptions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ class ClangImporterOptions {
9696
/// When set, don't enforce warnings with -Werror.
9797
bool DebuggerSupport = false;
9898

99+
/// When set, clobber the Clang instance's virtual file system with the Swift
100+
/// virtual file system.
101+
bool ForceUseSwiftVirtualFileSystem = false;
102+
99103
/// Return a hash code of any components from these options that should
100104
/// contribute to a Swift Bridging PCH hash.
101105
llvm::hash_code getPCHHashComponents() const {

‎branches/master-next/include/swift/Frontend/Frontend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class CompilerInstance {
462462

463463
void createDependencyTracker(bool TrackSystemDeps) {
464464
assert(!Context && "must be called before setup()");
465-
DepTracker = std::make_unique<DependencyTracker>(TrackSystemDeps);
465+
DepTracker = llvm::make_unique<DependencyTracker>(TrackSystemDeps);
466466
}
467467
DependencyTracker *getDependencyTracker() { return DepTracker.get(); }
468468

‎branches/master-next/include/swift/LLVMPasses/Passes.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,8 @@ namespace swift {
3030
const llvm::PreservedAnalyses &) { return false; }
3131

3232
using AAResultBase::getModRefInfo;
33-
llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
34-
const llvm::MemoryLocation &Loc) {
35-
llvm::AAQueryInfo AAQI;
36-
return getModRefInfo(Call, Loc, AAQI);
37-
}
38-
llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
39-
const llvm::MemoryLocation &Loc,
40-
llvm::AAQueryInfo &AAQI);
33+
llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
34+
const llvm::MemoryLocation &Loc);
4135
};
4236

4337
class SwiftAAWrapperPass : public llvm::ImmutablePass {

‎branches/master-next/include/swift/Parse/Parser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "llvm/ADT/SetVector.h"
4141

4242
namespace llvm {
43-
template <typename... PTs> class PointerUnion;
43+
template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
4444
}
4545

4646
namespace swift {

‎branches/master-next/include/swift/SIL/PatternMatch.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ namespace detail {
310310
struct GetOperandsFunctor {
311311
template <size_t... Idx>
312312
std::array<SILValue, sizeof...(Idx)>
313-
operator()(SILInstruction *i, std::index_sequence<Idx...> seq) const {
313+
operator()(SILInstruction *i, llvm::index_sequence<Idx...> seq) const {
314314
return {i->getOperand(Idx)...};
315315
}
316316
};
@@ -327,15 +327,15 @@ template <typename... MatcherTys> struct MatcherFunctor {
327327
template <size_t... Idx>
328328
std::array<bool, sizeof...(MatcherTys)>
329329
matchHelper(const std::array<SILValue, sizeof...(MatcherTys)> &operands,
330-
std::index_sequence<Idx...> seq) {
330+
llvm::index_sequence<Idx...> seq) {
331331
return {individual(std::get<Idx>(matchers), std::get<Idx>(operands))...};
332332
}
333333

334334
bool match(SILInstruction *i) {
335335
std::array<SILValue, sizeof...(MatcherTys)> operands =
336-
GetOperandsFunctor{}(i, std::index_sequence_for<MatcherTys...>{});
336+
GetOperandsFunctor{}(i, llvm::index_sequence_for<MatcherTys...>{});
337337
auto tmpResult =
338-
matchHelper(operands, std::index_sequence_for<MatcherTys...>{});
338+
matchHelper(operands, llvm::index_sequence_for<MatcherTys...>{});
339339
for (unsigned i : indices(tmpResult)) {
340340
if (!tmpResult[i])
341341
return false;

‎branches/master-next/include/swift/SIL/SILInstruction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ class MultipleValueInstructionTrailingObjects<Derived, DerivedResult,
988988
MultipleValueInstruction *,
989989
DerivedResult,
990990
FinalOtherTrailingTypes...> {
991-
static_assert(std::is_final<DerivedResult>(),
991+
static_assert(LLVM_IS_FINAL(DerivedResult),
992992
"Expected DerivedResult to be final");
993993
static_assert(
994994
std::is_base_of<MultipleValueInstructionResult, DerivedResult>::value,

‎branches/master-next/include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ class BasicCalleeAnalysis : public SILAnalysis {
164164

165165
CalleeList getCalleeList(FullApplySite FAS) {
166166
if (!Cache)
167-
Cache = std::make_unique<CalleeCache>(M);
167+
Cache = llvm::make_unique<CalleeCache>(M);
168168

169169
return Cache->getCalleeList(FAS);
170170
}
171171

172172
CalleeList getCalleeList(SILInstruction *I) {
173173
if (!Cache)
174-
Cache = std::make_unique<CalleeCache>(M);
174+
Cache = llvm::make_unique<CalleeCache>(M);
175175

176176
return Cache->getCalleeList(I);
177177
}

‎branches/master-next/include/swift/SILOptimizer/Analysis/DominanceAnalysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class DominanceAnalysis : public FunctionAnalysisBase<DominanceInfo> {
4242
}
4343

4444
std::unique_ptr<DominanceInfo> newFunctionAnalysis(SILFunction *F) override {
45-
return std::make_unique<DominanceInfo>(F);
45+
return llvm::make_unique<DominanceInfo>(F);
4646
}
4747

4848
virtual bool shouldInvalidate(SILAnalysis::InvalidationKind K) override {
@@ -72,7 +72,7 @@ class PostDominanceAnalysis : public FunctionAnalysisBase<PostDominanceInfo> {
7272

7373
std::unique_ptr<PostDominanceInfo>
7474
newFunctionAnalysis(SILFunction *F) override {
75-
return std::make_unique<PostDominanceInfo>(F);
75+
return llvm::make_unique<PostDominanceInfo>(F);
7676
}
7777

7878
virtual bool shouldInvalidate(SILAnalysis::InvalidationKind K) override {

‎branches/master-next/include/swift/SILOptimizer/Analysis/EpilogueARCAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class EpilogueARCAnalysis : public FunctionAnalysisBase<EpilogueARCFunctionInfo>
302302

303303
virtual std::unique_ptr<EpilogueARCFunctionInfo>
304304
newFunctionAnalysis(SILFunction *F) override {
305-
return std::make_unique<EpilogueARCFunctionInfo>(F, PO, AA, RC);
305+
return llvm::make_unique<EpilogueARCFunctionInfo>(F, PO, AA, RC);
306306
}
307307

308308
virtual bool shouldInvalidate(SILAnalysis::InvalidationKind K) override {

‎branches/master-next/include/swift/SILOptimizer/Analysis/IVAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class IVAnalysis final : public FunctionAnalysisBase<IVInfo> {
9191
}
9292

9393
std::unique_ptr<IVInfo> newFunctionAnalysis(SILFunction *F) override {
94-
return std::make_unique<IVInfo>(*F);
94+
return llvm::make_unique<IVInfo>(*F);
9595
}
9696

9797
/// For now we always invalidate.

‎branches/master-next/include/swift/SILOptimizer/Analysis/LoopRegionAnalysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class LoopRegion {
384384
private:
385385
/// A pointer to one of a Loop, Basic Block, or Function represented by this
386386
/// region.
387-
llvm::PointerUnion<FunctionTy *, LoopTy *, BlockTy *> Ptr;
387+
llvm::PointerUnion3<FunctionTy *, LoopTy *, BlockTy *> Ptr;
388388

389389
/// The ID of this region.
390390
unsigned ID;
@@ -1082,7 +1082,7 @@ class LoopRegionAnalysis : public FunctionAnalysisBase<LoopRegionFunctionInfo> {
10821082

10831083
virtual std::unique_ptr<LoopRegionFunctionInfo>
10841084
newFunctionAnalysis(SILFunction *F) override {
1085-
return std::make_unique<LoopRegionFunctionInfo>(F, POA->get(F),
1085+
return llvm::make_unique<LoopRegionFunctionInfo>(F, POA->get(F),
10861086
SLA->get(F));
10871087
}
10881088

‎branches/master-next/include/swift/SILOptimizer/Analysis/PostOrderAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PostOrderAnalysis : public FunctionAnalysisBase<PostOrderFunctionInfo> {
3636
protected:
3737
virtual std::unique_ptr<PostOrderFunctionInfo>
3838
newFunctionAnalysis(SILFunction *F) override {
39-
return std::make_unique<PostOrderFunctionInfo>(F);
39+
return llvm::make_unique<PostOrderFunctionInfo>(F);
4040
}
4141

4242
virtual bool shouldInvalidate(SILAnalysis::InvalidationKind K) override {

‎branches/master-next/include/swift/SILOptimizer/Analysis/RCIdentityAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class RCIdentityAnalysis : public FunctionAnalysisBase<RCIdentityFunctionInfo> {
120120

121121
virtual std::unique_ptr<RCIdentityFunctionInfo>
122122
newFunctionAnalysis(SILFunction *F) override {
123-
return std::make_unique<RCIdentityFunctionInfo>(DA);
123+
return llvm::make_unique<RCIdentityFunctionInfo>(DA);
124124
}
125125

126126
virtual bool shouldInvalidate(SILAnalysis::InvalidationKind K) override {

‎branches/master-next/lib/AST/ASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ void ASTContext::registerGenericSignatureBuilder(
15301530

15311531
++NumRegisteredGenericSignatureBuilders;
15321532
genericSignatureBuilders[canSig] =
1533-
std::make_unique<GenericSignatureBuilder>(std::move(builder));
1533+
llvm::make_unique<GenericSignatureBuilder>(std::move(builder));
15341534
}
15351535

15361536
GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(

‎branches/master-next/lib/AST/Builtins.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,13 +1378,9 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
13781378
case IITDescriptor::ExtendArgument:
13791379
case IITDescriptor::TruncArgument:
13801380
case IITDescriptor::HalfVecArgument:
1381-
case IITDescriptor::ScalableVecArgument:
13821381
case IITDescriptor::VarArg:
13831382
case IITDescriptor::Token:
1384-
case IITDescriptor::VecElementArgument:
13851383
case IITDescriptor::VecOfAnyPtrsToElt:
1386-
case IITDescriptor::Subdivide2Argument:
1387-
case IITDescriptor::Subdivide4Argument:
13881384
// These types cannot be expressed in swift yet.
13891385
return Type();
13901386

‎branches/master-next/lib/AST/DiagnosticConsumer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ FileSpecificDiagnosticConsumer::consolidateSubconsumers(
7171
if (subconsumers.size() == 1)
7272
return std::move(subconsumers.front()).consumer;
7373
// Cannot use return
74-
// std::make_unique<FileSpecificDiagnosticConsumer>(subconsumers); because
74+
// llvm::make_unique<FileSpecificDiagnosticConsumer>(subconsumers); because
7575
// the constructor is private.
7676
return std::unique_ptr<DiagnosticConsumer>(
7777
new FileSpecificDiagnosticConsumer(subconsumers));

0 commit comments

Comments
 (0)