diff --git a/flang/include/flang/Frontend/FrontendActions.h b/flang/include/flang/Frontend/FrontendActions.h --- a/flang/include/flang/Frontend/FrontendActions.h +++ b/flang/include/flang/Frontend/FrontendActions.h @@ -84,6 +84,9 @@ //===----------------------------------------------------------------------===// // PrescanAndSema Actions +// +// These actions will parse the input, run the semantic checks and execute +// their actions provided that no parsing or semantic errors were found. //===----------------------------------------------------------------------===// class PrescanAndSemaAction : public FrontendAction { @@ -107,10 +110,6 @@ void ExecuteAction() override; }; -class DebugDumpAllAction : public PrescanAndSemaAction { - void ExecuteAction() override; -}; - class DebugPreFIRTreeAction : public PrescanAndSemaAction { void ExecuteAction() override; }; @@ -131,6 +130,22 @@ void ExecuteAction() override = 0; }; +//===----------------------------------------------------------------------===// +// PrescanAndSemaDebug Actions +// +// These actions will parse the input, run the semantic checks and execute +// their actions regardless of whether any semantic errors are found. +//===----------------------------------------------------------------------===// +class PrescanAndSemaDebugAction : public FrontendAction { + + void ExecuteAction() override = 0; + bool BeginSourceFileAction() override; +}; + +class DebugDumpAllAction : public PrescanAndSemaDebugAction { + void ExecuteAction() override; +}; + } // namespace Fortran::frontend #endif // LLVM_FLANG_FRONTEND_FRONTENDACTIONS_H diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp --- a/flang/lib/Frontend/FrontendActions.cpp +++ b/flang/lib/Frontend/FrontendActions.cpp @@ -40,6 +40,11 @@ return RunPrescan() & RunParse() && RunSemanticChecks(); } +bool PrescanAndSemaDebugAction::BeginSourceFileAction() { + // Semantic checks are made to succeed unconditionally. + return RunPrescan() && RunParse() && (RunSemanticChecks() || true); +} + //===----------------------------------------------------------------------===// // Custom ExecuteAction //===----------------------------------------------------------------------===// diff --git a/flang/test/Driver/dump-all-bad.f90 b/flang/test/Driver/dump-all-bad.f90 new file mode 100644 --- /dev/null +++ b/flang/test/Driver/dump-all-bad.f90 @@ -0,0 +1,21 @@ +! Verify that -fdebug-dump-all dumps both symbols and the parse tree, even when semantic errors are present + +!---------- +! RUN lines +!---------- +! RUN: not %flang_fc1 -fdebug-dump-all %s 2>&1 | FileCheck %s + +!---------------- +! EXPECTED OUTPUT +!---------------- +! CHECK: error: Semantic errors in +! CHECK: Flang: parse tree dump +! CHECK: Flang: symbols dump + +!------- +! INPUT +!------- +program bad + real,pointer :: x + x = null() ! Error - must be pointer assignment +end