Skip to content

Commit 0fba70e

Browse files
committed
[flang][debug] Run AddDebugInfo before TargetRewrite.
This help us generate debug info that better represents the actual Fortran source code. Fixes #108711.
1 parent 89f2d50 commit 0fba70e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

flang/lib/Optimizer/Passes/Pipelines.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
264264
addNestedPassToAllTopLevelOperations(pm, fir::createAbstractResultOpt);
265265
fir::addCodeGenRewritePass(
266266
pm, (config.DebugInfo != llvm::codegenoptions::NoDebugInfo));
267+
fir::createDebugPasses(pm, config.DebugInfo, config.OptLevel, inputFilename);
267268
fir::addTargetRewritePass(pm);
268269
fir::addCompilerGeneratedNamesConversionPass(pm);
269270
fir::addExternalNameConversionPass(pm, config.Underscoring);
270-
fir::createDebugPasses(pm, config.DebugInfo, config.OptLevel, inputFilename);
271271

272272
if (config.VScaleMin != 0)
273273
pm.addPass(fir::createVScaleAttr({{config.VScaleMin, config.VScaleMax}}));

flang/test/Driver/mlir-debug-pass-pipeline.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@
111111

112112
! ALL-NEXT: CodeGenRewrite
113113
! ALL-NEXT: (S) 0 num-dce'd - Number of operations eliminated
114+
! DEBUG-NEXT: AddDebugInfo
115+
! NO-DEBUG-NOT: AddDebugInfo
114116
! ALL-NEXT: TargetRewrite
115117
! ALL-NEXT: CompilerGeneratedNamesConversion
116118
! ALL-NEXT: ExternalNameConversion
117-
! DEBUG-NEXT: AddDebugInfo
118-
! NO-DEBUG-NOT: AddDebugInfo
119119
! ALL: FIRToLLVMLowering
120120
! ALL-NOT: LLVMIRLoweringPass

0 commit comments

Comments
 (0)