Fix rust breakage with nr2

Nr2 did not emit the correct error message for break identifier "rust".

gcc/rust/ChangeLog:

	* resolve/rust-late-name-resolver-2.0.cc (Late::visit): Add "rust"
	identifier detection akin to nr1.
	(funny_ice_finalizer): Copy ICE finalizer from nr1.
	* resolve/rust-late-name-resolver-2.0.h: Add funny_error member
	context state.
	* Make-lang.in: Add new translation unit for new ice finalizer.
	* resolve/rust-ast-resolve-expr.cc: Move ice
	finalizer to it's own file.
	* resolve/rust-ice-finalizer.cc: New file.
	* resolve/rust-ice-finalizer.h: New file.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove break-rust3.rs from exclude list.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

1 files changed, 37 insertions, 0 deletions

diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
index f3ee08f..a7408fb 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -27,6 +27,8 @@
 #include "rust-system.h"
 #include "rust-tyty.h"
 #include "rust-hir-type-check.h"
+#include "rust-ice-finalizer.h"
+#include "rust-ast.h"
 
 namespace Rust {
 namespace Resolver2_0 {
@@ -178,6 +180,34 @@ Late::visit (AST::SelfParam &param)
 }
 
 void
+Late::visit (AST::BreakExpr &expr)
+{
+  if (expr.has_break_expr ())
+    {
+      auto &break_expr = expr.get_break_expr ();
+      if (break_expr.get_expr_kind () == AST::Expr::Kind::Identifier)
+	{
+	  /* This is a break with an expression, and the expression is
+	     just a single identifier.  See if the identifier is either
+	     "rust" or "gcc", in which case we have "break rust" or "break
+	     gcc", and so may need to emit our funny error.  We cannot yet
+	     emit the error here though, because the identifier may still
+	     be in scope, and ICE'ing on valid programs would not be very
+	     funny.  */
+	  std::string ident
+	    = static_cast<AST::IdentifierExpr &> (expr.get_break_expr ())
+		.as_string ();
+	  if (ident == "rust" || ident == "gcc")
+	    funny_error = true;
+	}
+    }
+
+  DefaultResolver::visit (expr);
+
+  funny_error = false;
+}
+
+void
 Late::visit (AST::IdentifierExpr &expr)
 {
   // TODO: same thing as visit(PathInExpression) here?
@@ -192,6 +222,13 @@ Late::visit (AST::IdentifierExpr &expr)
     {
       resolved = type;
     }
+  else if (funny_error)
+    {
+      diagnostic_finalizer (global_dc) = Resolver::funny_ice_finalizer;
+      emit_diagnostic (DK_ICE_NOBT, expr.get_locus (), -1,
+		       "are you trying to break %s? how dare you?",
+		       expr.as_string ().c_str ());
+    }
   else
     {
       rust_error_at (expr.get_locus (),