Fix redundant errors with missing default arguments in member declarations.

llvm-svn: 64085

1 files changed, 5 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index f5681af0fa0..c0160b2d423 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1707,8 +1707,11 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
   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).