From 5c7687bdbe2758b92c1de037936a4053e042fb2b Mon Sep 17 00:00:00 2001 From: Peter Steinfeld Date: Wed, 10 Apr 2019 11:40:52 -0700 Subject: [PATCH] [flang] Removed erroneous reference to "obsolete" and fixed up the message as per Peter Klauser's recommendation. Original-commit: flang-compiler/f18@f4d6d7007d6ce77761b0f2b99be011d48a996ce5 Reviewed-on: https://github.com/flang-compiler/f18/pull/398 Tree-same-pre-rewrite: false --- flang/lib/semantics/resolve-labels.cc | 4 ++-- flang/test/semantics/canondo07.f90 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flang/lib/semantics/resolve-labels.cc b/flang/lib/semantics/resolve-labels.cc index 81c9674..f7d9fb0 100644 --- a/flang/lib/semantics/resolve-labels.cc +++ b/flang/lib/semantics/resolve-labels.cc @@ -898,12 +898,12 @@ void CheckLabelDoConstraints(const SourceStmtList &dos, TargetStatementEnum::CompatibleDo)) { errorHandler.Say(doTarget.parserCharBlock, parser::MessageFormattedText{ - "'%u' Obsolete construct. A DO loop should terminate with END DO or CONTINUE"_err_en_US, + "Only an END DO or CONTINUE should be used to terminate a labeled DO loop"_err_en_US, SayLabel(label)}); } else { errorHandler.Say(doTarget.parserCharBlock, parser::MessageFormattedText{ - "'%u' A DO loop should terminate with END DO or CONTINUE statement"_en_US, + "Only an END DO or CONTINUE should be used to terminate a labeled DO loop"_en_US, SayLabel(label)}); } } else { diff --git a/flang/test/semantics/canondo07.f90 b/flang/test/semantics/canondo07.f90 index 8ea7aca..e457ba3 100644 --- a/flang/test/semantics/canondo07.f90 +++ b/flang/test/semantics/canondo07.f90 @@ -16,7 +16,7 @@ ! See R1131 and C1131 ! RUN: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s -! CHECK: A DO loop should terminate with END DO or CONTINUE +! CHECK: Only an END DO or CONTINUE should be used to terminate a labeled DO loop program endDo do 10 i = 1, 5 -- 2.7.4