diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-06-08 21:03:17 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-06-08 21:03:17 +0000 |
| commit | ce21919bd696d9be6d694a8885ff59d40fe57165 (patch) | |
| tree | 81c423dfa69aaeb10f72ea794b8bedcb66d42783 /clang/lib/Sema | |
| parent | 3b836180546c2af22fe55c332e8245d8e1a8b8fb (diff) | |
| download | bcm5719-llvm-ce21919bd696d9be6d694a8885ff59d40fe57165.tar.gz bcm5719-llvm-ce21919bd696d9be6d694a8885ff59d40fe57165.zip | |
A built-in overload candidate is consider a non-template function when
determining whether one overload candidate is better than
another. Fixes PR7319.
llvm-svn: 105642
Diffstat (limited to 'clang/lib/Sema')
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 6a020d57d37..d746ec3f6dc 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -4955,7 +4955,7 @@ Sema::isBetterOverloadCandidate(const OverloadCandidate& Cand1, // - F1 is a non-template function and F2 is a function template // specialization, or, if not that, - if (Cand1.Function && !Cand1.Function->getPrimaryTemplate() && + if ((!Cand1.Function || !Cand1.Function->getPrimaryTemplate()) && Cand2.Function && Cand2.Function->getPrimaryTemplate()) return true; |
