diff options
| author | Douglas Gregor <dgregor@apple.com> | 2015-06-22 17:19:03 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2015-06-22 17:19:03 +0000 |
| commit | 83e32984aeb78f89763693020a377f195f4a9a7e (patch) | |
| tree | dbe58869263a1637b51ae634fe9dc10cbe5a7492 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 1a3ae83722198c72c90892ee54046fcb5db80684 (diff) | |
| download | bcm5719-llvm-83e32984aeb78f89763693020a377f195f4a9a7e.tar.gz bcm5719-llvm-83e32984aeb78f89763693020a377f195f4a9a7e.zip | |
Misc. cleanups suggested by Aaron Ballman
llvm-svn: 240297
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 2e62ea66a5f..cb1be8d5053 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -2480,8 +2480,7 @@ static void mergeParamDeclTypes(ParmVarDecl *NewParam, << ((OldParam->getObjCDeclQualifier() & Decl::OBJC_TQ_CSNullability) != 0); S.Diag(OldParam->getLocation(), diag::note_previous_declaration); } - } - else { + } else { QualType NewT = NewParam->getType(); NewT = S.Context.getAttributedType( AttributedType::getNullabilityAttrKind(*Oldnullability), |
