re PR middle-end/51212 (ICE: verify_flow_info failed: BB 3 can not throw but has…

re PR middle-end/51212 (ICE: verify_flow_info failed: BB 3 can not throw but has an EH edge with -fgnu-tm -fnon-call-exceptions and transaction_callable)

        PR middle-end/51212
        * opts.c (finish_options): Sorry out when using transactional
        memory and non-call exceptions.
        * doc/invoke.texi (C Dialect Options): Document it.

From-SVN: r182877

gcc/ChangeLog

 2012-01-04  Aldy Hernandez  <aldyh@redhat.com>
 
+	PR middle-end/51212
+	* opts.c (finish_options): Sorry out when using transactional
+	memory and non-call exceptions.
+	* doc/invoke.texi (C Dialect Options): Document it.
+
+2012-01-04  Aldy Hernandez  <aldyh@redhat.com>
+
 	PR middle-end/51696
 	* trans-mem.c (diagnose_tm_1): Display indirect calls with no name
 	correctly.

gcc/doc/invoke.texi

@@ -1742,6 +1742,9 @@ For more information on GCC's support for transactional memory,
 @xref{Enabling libitm,,The GNU Transactional Memory Library,libitm,GNU
 Transactional Memory Library}.
 
+Note that the transactional memory feature is not supported with
+non-call exceptions (@option{-fnon-call-exceptions}).
+
 @item -fms-extensions
 @opindex fms-extensions
 Accept some non-standard constructs used in Microsoft header files.

gcc/opts.c

@@ -666,6 +666,9 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
   if (opts->x_flag_tm && opts->x_flag_non_call_exceptions)
     sorry ("transactional memory is not supported with non-call exceptions");
 
+  if (opts->x_flag_tm && opts->x_flag_non_call_exceptions)
+    sorry ("transactional memory is not supported with non-call exceptions");
+
   /* -Wmissing-noreturn is alias for -Wsuggest-attribute=noreturn.  */
   if (opts->x_warn_missing_noreturn)
     opts->x_warn_suggest_attribute_noreturn = true;