Fix redundant errors with missing default arguments in member declarations.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64085 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index f5681af..c0160b2 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1707,8 +1707,11 @@
ProcessDeclAttributes(NewFD, D);
if (getLangOptions().CPlusPlus) {
- // In C++, check default arguments now that we have merged decls.
- CheckCXXDefaultArguments(NewFD);
+ // In C++, check default arguments now that we have merged decls. Unless
+ // the lexical context is the class, because in this case this is done
+ // during delayed parsing anyway.
+ if (!CurContext->isRecord())
+ CheckCXXDefaultArguments(NewFD);
// An out-of-line member function declaration must also be a
// definition (C++ [dcl.meaning]p1).
diff --git a/test/SemaCXX/default2.cpp b/test/SemaCXX/default2.cpp
index 604354b..f3d726f 100644
--- a/test/SemaCXX/default2.cpp
+++ b/test/SemaCXX/default2.cpp
@@ -1,6 +1,4 @@
// RUN: clang -fsyntax-only -verify %s
-// XFAIL
-// fails due to exact diagnostic matching
void f(int i, int j, int k = 3);
void f(int i, int j, int k);
@@ -100,7 +98,7 @@
// constructors.
class Z {
public:
- Z(Z&, int i = 17); // expected-note{{candidate function}}
+ Z(Z&, int i = 17); // expected-note 2 {{candidate function}}
void f(Z& z) {
Z z2; // expected-error{{no matching constructor for initialization}}