summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaOverload.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-02-10 08:36:38 +0000
committerDouglas Gregor <dgregor@apple.com>2012-02-10 08:36:38 +0000
commit12695101ec453c4b000f9be5ab56e81a37218d4a (patch)
tree77474d9dbac25970c6b0e4790f4af6d734ae7e77 /clang/lib/Sema/SemaOverload.cpp
parent9c702207e54359117173909556f149c19d27ecc6 (diff)
downloadbcm5719-llvm-12695101ec453c4b000f9be5ab56e81a37218d4a.tar.gz
bcm5719-llvm-12695101ec453c4b000f9be5ab56e81a37218d4a.zip
Implement the conversion to a function pointer for lambda expressions,
per C++ [expr.prim.lambda]p6. llvm-svn: 150236
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r--clang/lib/Sema/SemaOverload.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index 54dd5f86527..3493b2a9dec 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -7583,9 +7583,11 @@ OverloadCandidateKind ClassifyOverloadCandidate(Sema &S,
if (Meth->isMoveAssignmentOperator())
return oc_implicit_move_assignment;
- assert(Meth->isCopyAssignmentOperator()
- && "implicit method is not copy assignment operator?");
- return oc_implicit_copy_assignment;
+ if (Meth->isCopyAssignmentOperator())
+ return oc_implicit_copy_assignment;
+
+ assert(isa<CXXConversionDecl>(Meth) && "expected conversion");
+ return oc_method;
}
return isTemplate ? oc_function_template : oc_function;
OpenPOWER on IntegriCloud