From: Peter Steinfeld <psteinfeld@nvidia.com>
Date: Wed, 10 Apr 2019 18:40:52 +0000 (-0700)
Subject: [flang] Removed erroneous reference to "obsolete" and fixed up the message
X-Git-Tag: llvmorg-12-init~9537^2~1408
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c7687bdbe2758b92c1de037936a4053e042fb2b;p=platform%2Fupstream%2Fllvm.git

[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
---

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