[PATCH] D118695: [flang] Add lowering for basic empty SUBROUTINE

[Valentin Clement via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG89275300d861: [flang] Add lowering for basic empty SUBROUTINE (authored by clementval).

Changed prior to commit:
  https://reviews.llvm.org/D118695?vs=404893&id=404908#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D118695/new/

https://reviews.llvm.org/D118695

Files:
  flang/lib/Lower/Bridge.cpp
  flang/test/Lower/basic-subroutine.f90


Index: flang/test/Lower/basic-subroutine.f90
===================================================================
--- /dev/null
+++ flang/test/Lower/basic-subroutine.f90
@@ -0,0 +1,13 @@
+! RUN: bbc %s --pft-test | FileCheck %s
+! RUN: bbc %s -o "-" -emit-fir | FileCheck %s --check-prefix=FIR
+
+subroutine sub1()
+end subroutine
+
+! CHECK: 1 Subroutine sub1: subroutine sub1()
+! CHECK:   1 EndSubroutineStmt: end subroutine
+! CHECK: End Subroutine sub1
+
+! FIR-LABEL: func @_QPsub1() {
+! FIR:         return
+! FIR:       }
Index: flang/lib/Lower/Bridge.cpp
===================================================================
--- flang/lib/Lower/Bridge.cpp
+++ flang/lib/Lower/Bridge.cpp
@@ -175,6 +175,8 @@
     setCurrentPosition(Fortran::lower::pft::stmtSourceLoc(funit.endStmt));
     if (funit.isMainProgram())
       genExitRoutine();
+    else
+      genFIRProcedureExit(funit, funit.getSubprogramSymbol());
     funit.finalBlock = nullptr;
     LLVM_DEBUG(llvm::dbgs() << "*** Lowering result:\n\n"
                             << *builder->getFunction() << '\n');
@@ -240,6 +242,15 @@
   }
   void genFIR(const Fortran::parser::EndProgramStmt &) { genExitRoutine(); }
 
+  void genFIRProcedureExit(Fortran::lower::pft::FunctionLikeUnit &funit,
+                           const Fortran::semantics::Symbol &symbol) {
+    if (Fortran::semantics::IsFunction(symbol)) {
+      TODO(toLocation(), "Function lowering");
+    } else {
+      genExitRoutine();
+    }
+  }
+
   void genFIR(const Fortran::parser::CallStmt &stmt) {
     TODO(toLocation(), "CallStmt lowering");
   }
@@ -606,9 +617,8 @@
     TODO(toLocation(), "EndSelectStmt lowering");
   }
 
-  void genFIR(const Fortran::parser::EndSubroutineStmt &) {
-    TODO(toLocation(), "EndSubroutineStmt lowering");
-  }
+  // Nop statements - No code, or code is generated at the construct level.
+  void genFIR(const Fortran::parser::EndSubroutineStmt &) {} // nop
 
   void genFIR(const Fortran::parser::EntryStmt &) {
     TODO(toLocation(), "EntryStmt lowering");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D118695.404908.patch
Type: text/x-patch
Size: 2037 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220201/73a4c7ed/attachment.bin>