From 02a395dcb7771985a1d0a2ca17a4e1d96788ca47 Mon Sep 17 00:00:00 2001 From: Peter Steinfeld Date: Tue, 2 Jul 2019 20:34:27 -0700 Subject: [PATCH] [flang] Changes in response to comments on pull request flang-compiler/f18#542. Original-commit: flang-compiler/f18@e156f977d856842bd8fe13d46133e5445404ee4d Reviewed-on: https://github.com/flang-compiler/f18/pull/542 Tree-same-pre-rewrite: false --- flang/lib/semantics/resolve-names.cc | 5 ++--- flang/lib/semantics/tools.cc | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc index 5c71710..8b5707c 100644 --- a/flang/lib/semantics/resolve-names.cc +++ b/flang/lib/semantics/resolve-names.cc @@ -3753,10 +3753,9 @@ bool DeclarationVisitor::PassesLocalityChecks( name, symbol, "Coarray '%s' not allowed in a locality-spec"_err_en_US); return false; } - const DeclTypeSpec *type{symbol.GetType()}; - if (type) { + if (const DeclTypeSpec * type{symbol.GetType()}) { if (type->IsPolymorphic() && symbol.IsDummy() && - (!IsPointer(symbol))) { // C1128 + !IsPointer(symbol)) { // C1128 SayWithDecl(name, symbol, "Nonpointer polymorphic argument '%s' not allowed in a " "locality-spec"_err_en_US); diff --git a/flang/lib/semantics/tools.cc b/flang/lib/semantics/tools.cc index a86b478..f994e05 100644 --- a/flang/lib/semantics/tools.cc +++ b/flang/lib/semantics/tools.cc @@ -386,12 +386,9 @@ const Symbol *FindUltimateComponent(const DerivedTypeSpec &derivedTypeSpec, } bool IsFinalizable(const Symbol &symbol) { - const DeclTypeSpec *type{symbol.GetType()}; - if (type) { - const DerivedTypeSpec *derived{type->AsDerived()}; - if (derived) { - const Scope *scope{derived->scope()}; - if (scope) { + if (const DeclTypeSpec * type{symbol.GetType()}) { + if (const DerivedTypeSpec * derived{type->AsDerived()}) { + if (const Scope * scope{derived->scope()}) { for (auto &pair : *scope) { Symbol &symbol{*pair.second}; if (symbol.has()) { -- 2.7.4