From 5f262a8f11b1fcb57878ae65abb5c37c91e62d2e Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Thu, 15 May 2014 20:52:22 -0400
Subject: [PATCH] Fix ENDLABEL warnings on escaped identifiers.

---
 Changes                                 | 2 ++
 src/verilog.y                           | 3 ++-
 test_regress/t/t_hierarchy_identifier.v | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index ab8bd168a..6316804ae 100644
--- a/Changes
+++ b/Changes
@@ -9,6 +9,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 ****  Fix huge shifts to zero with -Wno-WIDTH, bug765. [Clifford Wolf]
 
+****  Fix ENDLABEL warnings on escaped identifiers.
+
 
 * Verilator 3.860 2014-05-11
 
diff --git a/src/verilog.y b/src/verilog.y
index 8a6c0da0e..8f0e35ede 100644
--- a/src/verilog.y
+++ b/src/verilog.y
@@ -100,7 +100,8 @@ public:
     }
     void endLabel(FileLine* fl, AstNode* nodep, string* endnamep) { endLabel(fl, nodep->prettyName(), endnamep); }
     void endLabel(FileLine* fl, string name, string* endnamep) {
-	if (fl && endnamep && *endnamep != "" && name != *endnamep) {
+	if (fl && endnamep && *endnamep != "" && name != *endnamep
+	    && name != AstNode::prettyName(*endnamep)) {
 	    fl->v3warn(ENDLABEL,"End label '"<<*endnamep<<"' does not match begin label '"<<name<<"'");
 	}
     }
diff --git a/test_regress/t/t_hierarchy_identifier.v b/test_regress/t/t_hierarchy_identifier.v
index 48911ba82..3774c7812 100644
--- a/test_regress/t/t_hierarchy_identifier.v
+++ b/test_regress/t/t_hierarchy_identifier.v
@@ -27,10 +27,10 @@ module t (/*AUTOARG*/
 
    // finish report
    always @ (posedge clk)
-   if (cnt==SIZE) begin : if_cnt_finish
+   if (cnt==SIZE) begin : \0escaped___name
       $write("*-* All Finished *-*\n");
       $finish;
-   end : if_cnt_finish
+   end : \0escaped___name
 
    generate
    for (i=0; i<SIZE; i=i+1) begin : generate_for