[flang] address comments

Original-commit: flang-compiler/f18@2bf9955 Reviewed-on: flang-compiler/f18#638
llvm · Aug 9, 2019 · bc4d468 · bc4d468
1 parent f13f372
commit bc4d468
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc
@@ -3429,7 +3429,7 @@ void DeclarationVisitor::Post(
 
 void DeclarationVisitor::CheckBindings(
     const parser::TypeBoundProcedureStmt::WithoutInterface &tbps) {
-  CHECK(currScope().kind() == Scope::Kind::DerivedType);
+  CHECK(currScope().IsDerivedType());
   for (auto &declaration : tbps.declarations) {
     auto &bindingName{std::get<parser::Name>(declaration.t)};
     if (Symbol * binding{FindInScope(currScope(), bindingName)}) {
@@ -5511,7 +5511,7 @@ class DeferredCheckVisitor {
     const auto &name{std::get<parser::Name>(x.t)};
     if (Symbol * symbol{name.symbol}) {
       if (Scope * scope{symbol->scope()}) {
-        if (scope->kind() == Scope::Kind::DerivedType) {
+        if (scope->IsDerivedType()) {
           resolver_.PushScope(*scope);
           pushedScope_ = true;
         }

diff --git a/flang/lib/semantics/symbol.h b/flang/lib/semantics/symbol.h
@@ -204,13 +204,15 @@ class ProcEntityDetails : public EntityDetails, public WithPassArg {
   void set_interface(const ProcInterface &interface) { interface_ = interface; }
   inline bool HasExplicitInterface() const;
 
+  // Be advised: !init().has_value() => uninitialized pointer,
+  // while *init() == nullptr => explicit NULL() initialization.
   std::optional<const Symbol *> init() const { return init_; }
   void set_init(const Symbol &symbol) { init_ = &symbol; }
   void set_init(std::nullptr_t) { init_ = nullptr; }
 
 private:
   ProcInterface interface_;
-  std::optional<const Symbol *> init_;  // if present but null => NULL()
+  std::optional<const Symbol *> init_;
   friend std::ostream &operator<<(std::ostream &, const ProcEntityDetails &);
 };
 

diff --git a/flang/test/semantics/resolve20.f90 b/flang/test/semantics/resolve20.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.

diff --git a/flang/test/semantics/resolve32.f90 b/flang/test/semantics/resolve32.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2018-2019, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.