diff options
author | Daniel Jasper <djasper@google.com> | 2016-10-10 14:13:55 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2016-10-10 14:13:55 +0000 |
commit | e9abe648166a95a85105f4138ea41b345a66035e (patch) | |
tree | 551aed9b3cc942c9f7f0d0e95b5b02f2a0f8db04 /clang/lib/Sema/SemaOverload.cpp | |
parent | 610ad3a5985c1eb40917eb948f5a09266270112c (diff) | |
download | bcm5719-llvm-e9abe648166a95a85105f4138ea41b345a66035e.tar.gz bcm5719-llvm-e9abe648166a95a85105f4138ea41b345a66035e.zip |
Revert "P0035R4: Semantic analysis and code generation for C++17 overaligned allocation."
This reverts commit r283722. Breaks:
Clang.SemaCUDA.device-var-init.cu
Clang.CodeGenCUDA.device-var-init.cu
http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-expensive/884/
llvm-svn: 283750
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 082a6f98ef2..7ca85a907ea 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -10142,17 +10142,16 @@ static void CompleteNonViableCandidate(Sema &S, OverloadCandidate *Cand, /// PrintOverloadCandidates - When overload resolution fails, prints /// diagnostic messages containing the candidates in the candidate /// set. -void OverloadCandidateSet::NoteCandidates( - Sema &S, OverloadCandidateDisplayKind OCD, ArrayRef<Expr *> Args, - StringRef Opc, SourceLocation OpLoc, - llvm::function_ref<bool(OverloadCandidate &)> Filter) { +void OverloadCandidateSet::NoteCandidates(Sema &S, + OverloadCandidateDisplayKind OCD, + ArrayRef<Expr *> Args, + StringRef Opc, + SourceLocation OpLoc) { // Sort the candidates by viability and position. Sorting directly would // be prohibitive, so we make a set of pointers and sort those. SmallVector<OverloadCandidate*, 32> Cands; if (OCD == OCD_AllCandidates) Cands.reserve(size()); for (iterator Cand = begin(), LastCand = end(); Cand != LastCand; ++Cand) { - if (!Filter(*Cand)) - continue; if (Cand->Viable) Cands.push_back(Cand); else if (OCD == OCD_AllCandidates) { |