[flang-commits] [flang] [flang] Do not finalize main program variables. (PR #66326)

[via flang-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-flang-fir-hlfir
            
<details>
<summary>Changes</summary>
None
--
Full diff: https://github.com/llvm/llvm-project/pull/66326.diff

2 Files Affected:

- (modified) flang/lib/Lower/ConvertVariable.cpp (+5) 
- (modified) flang/test/Lower/derived-type-finalization.f90 (+1-14) 


<pre>
diff --git a/flang/lib/Lower/ConvertVariable.cpp b/flang/lib/Lower/ConvertVariable.cpp
index 03a7cca1ab69817..0b37fb2bd886be5 100644
--- a/flang/lib/Lower/ConvertVariable.cpp
+++ b/flang/lib/Lower/ConvertVariable.cpp
@@ -660,6 +660,11 @@ static bool needEndFinalization(const Fortran::lower::pft::Variable &amp;var) {
   if (!var.hasSymbol())
     return false;
   const Fortran::semantics::Symbol &amp;sym = var.getSymbol();
+  const Fortran::semantics::Scope &amp;owner = sym.owner();
+  if (owner.kind() == Fortran::semantics::Scope::Kind::MainProgram) {
+    // The standard does not require finalizing main program variables.
+    return false;
+  }
   if (!Fortran::semantics::IsPointer(sym) &amp;&amp;
       !Fortran::semantics::IsAllocatable(sym) &amp;&amp;
       !Fortran::semantics::IsDummy(sym) &amp;&amp;
diff --git a/flang/test/Lower/derived-type-finalization.f90 b/flang/test/Lower/derived-type-finalization.f90
index 2194fd8d96451d0..d0fbfe8906c4d1d 100644
--- a/flang/test/Lower/derived-type-finalization.f90
+++ b/flang/test/Lower/derived-type-finalization.f90
@@ -248,20 +248,7 @@ subroutine local_t4()
 program p
   use derived_type_finalization
   type(t1) :: t
-  if (t%a == 10) return
-  print *, &#x27;end of program&#x27;
 end program
 
 ! CHECK-LABEL: func.func @_QQmain() attributes {fir.bindc_name = &quot;p&quot;} {
-! CHECK: %[[T:.*]] = fir.alloca !fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt; {bindc_name = &quot;t&quot;, uniq_name = &quot;_QFEt&quot;}
-! CHECK: cf.cond_br %{{.*}}, ^bb1, ^bb2
-! CHECK: ^bb1:
-! CHECK:  %[[EMBOX:.*]] = fir.embox %[[T]] : (!fir.ref&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;) -&gt; !fir.box&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;
-! CHECK:  %[[BOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;) -&gt; !fir.box&lt;none&gt;
-! CHECK:  %{{.*}} = fir.call @_FortranADestroy(%[[BOX_NONE]]) {{.*}} : (!fir.box&lt;none&gt;) -&gt; none
-! CHECK:  return
-! CHECK: ^bb2:
-! CHECK:  %[[EMBOX:.*]] = fir.embox %[[T]] : (!fir.ref&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;) -&gt; !fir.box&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;
-! CHECK:  %[[BOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box&lt;!fir.type&lt;_QMderived_type_finalizationTt1{a:i32}&gt;&gt;) -&gt; !fir.box&lt;none&gt;
-! CHECK:  %{{.*}} = fir.call @_FortranADestroy(%[[BOX_NONE]]) {{.*}} : (!fir.box&lt;none&gt;) -&gt; none
-! CHECK:  return
+! CHECK-NOT: fir.call @_FortranADestroy
</pre>
</details>


https://github.com/llvm/llvm-project/pull/66326