commit 714fcc1bcb42508983f9fd3435aa1dcd06212a8c
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Jan 14 08:00:39 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Jan 14 08:00:39 2013 +0000
tree c3fe9d39584261281093f0402cf6a6fe39592cd8
parent f7a052732c2b6c82f74708038f75fa92c9b4dba0

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.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172384 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaOverload.cpp

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index cc9f4df..d3d027b 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1038,8 +1038,7 @@
     // 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;

test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp

diff --git a/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp b/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp
index 559838b..344f8ce 100644
--- a/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp
+++ b/test/CXX/dcl.dcl/dcl.spec/dcl.constexpr/p8.cpp
@@ -5,6 +5,8 @@
 struct S {
   constexpr int f();
   constexpr int g() const;
+  constexpr int h();
+  int h();
   static constexpr int Sf();
   /*static*/ constexpr void *operator new(size_t) noexcept;
   template<typename T> constexpr T tm();
@@ -25,6 +27,8 @@
 
 constexpr int S::f() const { return 0; }
 constexpr int S::g() { return 1; }
+constexpr int S::h() { return 0; }
+int S::h() { return 0; }
 constexpr int S::Sf() { return 2; }
 constexpr void *S::operator new(size_t) noexcept { return 0; }
 template<typename T> constexpr T S::tm() { return T(); }