-
Notifications
You must be signed in to change notification settings - Fork 12.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flang][debug] Fix issues with local variables. (#98661)
This PR fixes 2 similar issues. 1. As reported in #97476, flang generated executable has inconsistent behavior regarding values of the local array variables. 2. Variable with save attribute would not show up in debugger. The reason behind is same for both cases. If a local variable has storage which extends beyond function lifetime, the way to represent it in the debug info is through a global variable whose scope is limited to the function. This is what is used for static local variable in C. Previously local array worked in cases they were on stack. But will not show up if they had a global storage. To fix this, if we can get a corresponding `GlobalOp` for a variable while processing `DeclareOp`, we treat it the variable as global with scope set appropriately. A new FIR test is added. A previous Integration test has been adjusted as to not expect local variables for local arrays. With this fix in place, all the issues described in #97476 go away. It also fixes a lot of fails in GDB's fortran testsuite. Fixes #97476.
- Loading branch information
Showing
3 changed files
with
94 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // RUN: fir-opt --add-debug-info --mlir-print-debuginfo %s | FileCheck %s | ||
|
|
||
| module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<i64, dense<64> : vector<2xi64>>, #dlti.dl_entry<!llvm.ptr<272>, dense<64> : vector<4xi64>>, #dlti.dl_entry<!llvm.ptr<271>, dense<32> : vector<4xi64>>, #dlti.dl_entry<!llvm.ptr<270>, dense<32> : vector<4xi64>>, #dlti.dl_entry<f128, dense<128> : vector<2xi64>>, #dlti.dl_entry<f80, dense<128> : vector<2xi64>>, #dlti.dl_entry<i128, dense<128> : vector<2xi64>>, #dlti.dl_entry<i8, dense<8> : vector<2xi64>>, #dlti.dl_entry<!llvm.ptr, dense<64> : vector<4xi64>>, #dlti.dl_entry<i1, dense<8> : vector<2xi64>>, #dlti.dl_entry<f16, dense<16> : vector<2xi64>>, #dlti.dl_entry<f64, dense<64> : vector<2xi64>>, #dlti.dl_entry<i32, dense<32> : vector<2xi64>>, #dlti.dl_entry<i16, dense<16> : vector<2xi64>>, #dlti.dl_entry<"dlti.stack_alignment", 128 : i64>, #dlti.dl_entry<"dlti.endianness", "little">>, fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"} { | ||
| func.func @_QMexamplePmod_sub() { | ||
| %c2 = arith.constant 2 : index | ||
| %1 = fir.address_of(@_QMexampleEmod_arr) : !fir.ref<!fir.array<2x2xi32>> | ||
| %2 = fircg.ext_declare %1(%c2, %c2) {uniq_name = "_QMexampleEmod_arr"} : (!fir.ref<!fir.array<2x2xi32>>, index, index) -> !fir.ref<!fir.array<2x2xi32>> loc(#loc4) | ||
| %3 = fir.address_of(@_QMexampleFmod_subEss) : !fir.ref<i32> | ||
| %4 = fircg.ext_declare %3 {uniq_name = "_QMexampleFmod_subEss"} : (!fir.ref<i32>) -> !fir.ref<i32> loc(#loc5) | ||
| return | ||
| } loc(#loc6) | ||
| func.func @_QQmain() attributes {fir.bindc_name = "test"} { | ||
| %c3 = arith.constant 3 : index | ||
| %c4 = arith.constant 4 : index | ||
| %1 = fir.address_of(@_QFEarr) : !fir.ref<!fir.array<3x4xi32>> | ||
| %2 = fircg.ext_declare %1(%c3, %c4) {uniq_name = "_QFEarr"} : (!fir.ref<!fir.array<3x4xi32>>, index, index) -> !fir.ref<!fir.array<3x4xi32>> loc(#loc2) | ||
| %3 = fir.address_of(@_QFEs) : !fir.ref<i32> | ||
| %4 = fircg.ext_declare %3 {uniq_name = "_QFEs"} : (!fir.ref<i32>) -> !fir.ref<i32> loc(#loc3) | ||
| return | ||
| } loc(#loc1) | ||
| fir.global @_QMexampleEmod_arr : !fir.array<2x2xi32> { | ||
| %0 = fir.zero_bits !fir.array<2x2xi32> | ||
| fir.has_value %0 : !fir.array<2x2xi32> | ||
| } loc(#loc4) | ||
| fir.global internal @_QMexampleFmod_subEss : i32 { | ||
| %c2_i32 = arith.constant 2 : i32 | ||
| fir.has_value %c2_i32 : i32 | ||
| } loc(#loc5) | ||
| fir.global internal @_QFEarr : !fir.array<3x4xi32> { | ||
| %0 = fir.zero_bits !fir.array<3x4xi32> | ||
| fir.has_value %0 : !fir.array<3x4xi32> | ||
| } loc(#loc2) | ||
| fir.global internal @_QFEs : i32 { | ||
| %c2_i32 = arith.constant 2 : i32 | ||
| fir.has_value %c2_i32 : i32 | ||
| } loc(#loc3) | ||
| } | ||
| #loc1 = loc("test.f90":21:1) | ||
| #loc2 = loc("test.f90":22:1) | ||
| #loc3 = loc("test.f90":23:1) | ||
| #loc4 = loc("test.f90":5:1) | ||
| #loc5 = loc("test.f90":12:1) | ||
| #loc6 = loc("test.f90":10:1) | ||
|
|
||
| // CHECK-DAG: #[[CU:.*]] = #llvm.di_compile_unit<{{.*}}> | ||
| // CHECK-DAG: #[[MOD:.*]] = #llvm.di_module<{{.*}}scope = #[[CU]]{{.*}}name = "example"{{.*}}> | ||
| // CHECK-DAG: #[[SP:.*]] = #llvm.di_subprogram<{{.*}}name = "_QQmain"{{.*}}> | ||
| // CHECK-DAG: #[[MOD_SP:.*]] = #llvm.di_subprogram<{{.*}}name = "mod_sub"{{.*}}> | ||
| // CHECK-DAG: #llvm.di_global_variable<scope = #[[SP]], name = "arr"{{.*}}line = 22{{.*}}> | ||
| // CHECK-DAG: #llvm.di_global_variable<scope = #[[SP]], name = "s"{{.*}}line = 23{{.*}}> | ||
| // CHECK-DAG: #llvm.di_global_variable<scope = #[[MOD_SP]], name = "ss"{{.*}}line = 12{{.*}}> | ||
| // CHECK-DAG: #llvm.di_global_variable<scope = #[[MOD]], name = "mod_arr"{{.*}}line = 5{{.*}}> |