From: Eric Schweitz <eschweitz@nvidia.com>
Date: Wed, 19 Sep 2018 22:00:33 +0000 (-0700)
Subject: [flang] Fix a bug with BLOCK DATA name matching
X-Git-Tag: llvmorg-12-init~9537^2~2150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09a84c4d7d809d11e7495ca1919ecb26f3a0673b;p=platform%2Fupstream%2Fllvm.git

[flang] Fix a bug with BLOCK DATA name matching

Original-commit: flang-compiler/f18@f0af26df12912839d94a8ec5e7f66b8c22674a85
Reviewed-on: https://github.com/flang-compiler/f18/pull/189
---

diff --git a/flang/lib/semantics/resolve-labels.cc b/flang/lib/semantics/resolve-labels.cc
index 668ae8e..d89c6e9 100644
--- a/flang/lib/semantics/resolve-labels.cc
+++ b/flang/lib/semantics/resolve-labels.cc
@@ -318,10 +318,10 @@ public:
 
   // C1414
   void Post(const parser::BlockData &blockData) {
-    if (!namesBothEqualOrBothNone(
-            std::get<parser::Statement<parser::BlockDataStmt>>(blockData.t)
-                .statement.v,
+    if (!firstNameNoneOrBothEqual(
             std::get<parser::Statement<parser::EndBlockDataStmt>>(blockData.t)
+                .statement.v,
+            std::get<parser::Statement<parser::BlockDataStmt>>(blockData.t)
                 .statement.v)) {
       errorHandler_.Say(currentPosition_,
           parser::MessageFormattedText{"BLOCK DATA name mismatch"_err_en_US});