summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@acm.org>2015-01-30 14:21:35 +0000
committerNathan Sidwell <nathan@acm.org>2015-01-30 14:21:35 +0000
commit55d53fe79f0613bc48af9fba0e3bc7b9c0a224f7 (patch)
treef6f56f7c1c2363bda0ae265398cb7a7052c7004f /clang/lib/Sema/SemaDeclCXX.cpp
parent1efa12d6d8b68188854bdf618bb297e0e8a77d0c (diff)
downloadbcm5719-llvm-55d53fe79f0613bc48af9fba0e3bc7b9c0a224f7.tar.gz
bcm5719-llvm-55d53fe79f0613bc48af9fba0e3bc7b9c0a224f7.zip
Code cleanup
Parser::ParseLexedMethodDeclaration: Use local var for Param Sema::MergeCXXFunctionDecls: Use hasInheritedDefaultArg llvm-svn: 227577
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 79732c354ca..1ee4d53ab0c 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -509,14 +509,11 @@ bool Sema::MergeCXXFunctionDecl(FunctionDecl *New, FunctionDecl *Old,
// Look for the function declaration where the default argument was
// actually written, which may be a declaration prior to Old.
- for (FunctionDecl *Older = Old->getPreviousDecl();
- Older; Older = Older->getPreviousDecl()) {
- if (!Older->getParamDecl(p)->hasDefaultArg())
- break;
-
+ for (auto Older = Old; OldParam->hasInheritedDefaultArg();) {
+ Older = Older->getPreviousDecl();
OldParam = Older->getParamDecl(p);
- }
-
+ }
+
Diag(OldParam->getLocation(), diag::note_previous_definition)
<< OldParam->getDefaultArgRange();
} else if (OldParamHasDfl) {
OpenPOWER on IntegriCloud