diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-14 08:00:39 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-01-14 08:00:39 +0000 |
| commit | 59b8e701d3f5f314d370bde739362dbf0a54395a (patch) | |
| tree | dbcd04240c61899a2a88a97cb06184357e17de0f /clang/lib/Sema/SemaOverload.cpp | |
| parent | f55e719a13853de6e2e25afb7b51d610ffaf336d (diff) | |
| download | bcm5719-llvm-59b8e701d3f5f314d370bde739362dbf0a54395a.tar.gz bcm5719-llvm-59b8e701d3f5f314d370bde739362dbf0a54395a.zip | |
Fix regression in r172376. Don't try to detect missing 'constexpr' specifiers
on redeclarations, since that makes us pick wrong prior declarations under
some circumstances.
llvm-svn: 172384
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index cc9f4df4476..d3d027b8a56 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -1038,8 +1038,7 @@ bool Sema::IsOverload(FunctionDecl *New, FunctionDecl *Old, // or non-static member function). Add it now, on the assumption that this // is a redeclaration of OldMethod. unsigned NewQuals = NewMethod->getTypeQualifiers(); - if ((OldMethod->isConstexpr() || NewMethod->isConstexpr()) && - !isa<CXXConstructorDecl>(NewMethod)) + if (NewMethod->isConstexpr() && !isa<CXXConstructorDecl>(NewMethod)) NewQuals |= Qualifiers::Const; if (OldMethod->getTypeQualifiers() != NewQuals) return true; |
