[PATCH, C++] Make Canonical ICE instead of just warn when mismatching

[Andrew_Pinski@PlayStation.Sony.Com]

[-- Attachment #1: Type: text/plain, Size: 864 bytes --]

Since Doug mentioned it would ICE without checking enabled 
(http://gcc.gnu.org/ml/gcc-patches/2007-01/msg00172.html), it seems the 
right thing to just ICE and then watch out for more fall out.  Yes right 
now we know of a testcase where before this patch we will pass but after 
we will now ICE but it seems like a good idea to get this ICEing before we 
get more testcases where we ICE with checking disable.  (I posted the 
reduced testcase for this problem at 
http://gcc.gnu.org/ml/gcc-patches/2007-01/msg00209.html ).

OK? Bootstrapped and tested on i686-linux-gnu with no regressions.

Thanks,
Andrew Pinski

ChangeLog:

        * typeck.c (comptypes): Call error instead of warning for
        "canonical types differ for identical types".  And then
        call gcc_unreachable.
        Likewise for "same canonical type node for different types" case.


[-- Attachment #2: makeinternal_error.diff.txt --]
[-- Type: text/plain, Size: 1192 bytes --]

Index: typeck.c
===================================================================
--- typeck.c	(revision 120428)
+++ typeck.c	(working copy)
@@ -1121,22 +1121,22 @@ comptypes (tree t1, tree t2, int strict)
 	      /* The two types are structurally equivalent, but their
 		 canonical types were different. This is a failure of the
 		 canonical type propagation code.*/
-	      warning(0,
-		      "canonical types differ for identical types %T and %T", 
-		      t1, t2);
+	      error ("canonical types differ for identical types %T and %T", 
+		     t1, t2);
 	      debug_tree (t1);
 	      debug_tree (t2);
+	      gcc_unreachable ();
 	    }
 	  else if (!result && TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2))
 	    {
 	      /* Two types are structurally different, but the canonical
 		 types are the same. This means we were over-eager in
 		 assigning canonical types. */
-	      warning (0, 
-		       "same canonical type node for different types %T and %T",
-		       t1, t2);
+	      error ("same canonical type node for different types %T and %T",
+		     t1, t2);
 	      debug_tree (t1);
 	      debug_tree (t2);
+	      gcc_unreachable ();
 	    }
 	  
 	  return result;