From 43da7a187e43a8a681213b333fbd0a8b0e8b7bc7 Mon Sep 17 00:00:00 2001
From: Eric Schweitz <eschweitz@nvidia.com>
Date: Thu, 13 Sep 2018 15:34:34 -0700
Subject: [PATCH] [flang] Remove incorrect error message

Original-commit: flang-compiler/f18@9ef54520dfa4779023e5deb4bf366956b7f2c2ff
Reviewed-on: https://github.com/flang-compiler/f18/pull/184
Tree-same-pre-rewrite: false
---
 flang/lib/semantics/resolve-labels.cc | 4 ----
 flang/tools/f18/f18.cc                | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/flang/lib/semantics/resolve-labels.cc b/flang/lib/semantics/resolve-labels.cc
index e0a1884..d3d43a2 100644
--- a/flang/lib/semantics/resolve-labels.cc
+++ b/flang/lib/semantics/resolve-labels.cc
@@ -415,10 +415,6 @@ public:
               parser::MessageFormattedText{
                   "END PROGRAM name mismatch"_err_en_US});
         }
-      } else {
-        errorHandler_.Say(currentPosition_,
-            parser::MessageFormattedText{
-                "END PROGRAM must have a program-name"_err_en_US});
       }
     } else {
       if (std::get<parser::Statement<parser::EndProgramStmt>>(mainProgram.t)
diff --git a/flang/tools/f18/f18.cc b/flang/tools/f18/f18.cc
index f76ac4f..6955ac2 100644
--- a/flang/tools/f18/f18.cc
+++ b/flang/tools/f18/f18.cc
@@ -216,9 +216,7 @@ std::string CompileFortran(
     if (driver.moduleDirectory != "."s) {
       directories.insert(directories.begin(), driver.moduleDirectory);
     }
-    if (!Fortran::semantics::ValidateLabels(parseTree, parsing.cooked())) {
-      return {};
-    }
+    (void)Fortran::semantics::ValidateLabels(parseTree, parsing.cooked());
     Fortran::semantics::ResolveNames(Fortran::semantics::Scope::globalScope,
         parseTree, parsing.cooked(), directories);
     Fortran::semantics::ModFileWriter writer;
-- 
2.7.4