[flang] Fix potential null scope when lowering dispatch table op

Similary to D140209, the scope might need to be retrieved
from the typeSymbol. The test code was crashing because the
scope passed to CollectBindings was initially null.

Reviewed By: jeanPerier

Differential Revision: https://reviews.llvm.org/D143188

diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index 9033ab8026c228f24a91ece4bbfbd89cb0dd7866..aa844e592dde16d0b143c007f9a2f5eaa29c0c3a 100644 (file)
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -204,9 +204,11 @@ public:
           info.loc, dtName,
           parent ? Fortran::lower::mangle::mangleName(*parent) : "");
       auto insertPt = builder.saveInsertionPoint();
-
+      const Fortran::semantics::Scope *scope = info.typeSpec->scope();
+      if (!scope)
+        scope = info.typeSpec->typeSymbol().scope();
       Fortran::semantics::SymbolVector bindings =
-          Fortran::semantics::CollectBindings(*info.typeSpec->scope());
+          Fortran::semantics::CollectBindings(*scope);
 
       if (!bindings.empty())
         builder.createBlock(&dt.getRegion());

diff --git a/flang/test/Lower/dispatch.f90 b/flang/test/Lower/dispatch.f90
index 4328ac70747c34749b162664371370fe1755ed10..0331bfb08495d8d46e47d5e38b302f6ce499b5b2 100644 (file)
--- a/flang/test/Lower/dispatch.f90
+++ b/flang/test/Lower/dispatch.f90
@@ -39,6 +39,16 @@ module call_dispatch
     procedure(nopass_defferred), deferred, nopass :: nopassd
   end type
 
+  type :: node
+    type(node_ptr), pointer :: n(:)
+  end type
+  type :: use_node
+    type(node) :: n
+  end type
+  type :: node_ptr
+    type(node_ptr), pointer :: n
+  end type
+
   contains
 
 ! ------------------------------------------------------------------------------
@@ -341,4 +351,8 @@ module call_dispatch
 ! CHECK: fir.call @_QMcall_dispatchPtbp_pass_arg0
 ! CHECK: fir.call @_QMcall_dispatchPtbp_pass_arg1
 
+  subroutine use_node_test(n)
+    type(use_node) :: n
+  end subroutine
+
 end module