[google] Disable annotalysis in google/main

[Diego Novillo, 2011-07-25 21:04:41]

Annotalysis has been broken in google/main since the last merge from
trunk.  This patch disables it until Delesley comes up with a
permanent solution.

Tested on x86_64.  OK for google/main?


2011-07-25  Diego Novillo  <dnovillo@google.com>

	* tree-threadsafe-analyze.c (gate_threadsafe_analyze): Always
	return false.

2011-07-25   Diego Novillo  <dnovillo@google.com>

	* gcc/testsuite/g++.dg/dg.exp: Remove tests in directory
	thread-ann.

Index: gcc/testsuite/g++.dg/dg.exp
===================================================================
--- gcc/testsuite/g++.dg/dg.exp	(revision 176640)
+++ gcc/testsuite/g++.dg/dg.exp	(working copy)
@@ -48,6 +48,7 @@ set tests [prune $tests $srcdir/$subdir/
 set tests [prune $tests $srcdir/$subdir/torture/*]
 set tests [prune $tests $srcdir/$subdir/graphite/*]
 set tests [prune $tests $srcdir/$subdir/guality/*]
+set tests [prune $tests $srcdir/$subdir/thread-ann/*]
 
 # Main loop.
 dg-runtest $tests "" $DEFAULT_CXXFLAGS
Index: gcc/tree-threadsafe-analyze.c
===================================================================
--- gcc/tree-threadsafe-analyze.c	(revision 176640)
+++ gcc/tree-threadsafe-analyze.c	(working copy)
@@ -3571,7 +3571,8 @@ execute_threadsafe_analyze (void)
 static bool
 gate_threadsafe_analyze (void)
 {
-  return warn_thread_safety != 0;
+  /* FIXME google/main - Annotalysis is currently broken.  */
+  return false;
 }
 
 struct gimple_opt_pass pass_threadsafe_analyze =

--
This patch is available for review at http://codereview.appspot.com/4816050

[delesley, 2011-07-25 23:02:49]

Looks Good To Me.

  -DeLesley

On Mon, Jul 25, 2011 at 2:04 PM, Diego Novillo <dnovillo@google.com> wrote:
>
> Annotalysis has been broken in google/main since the last merge from
> trunk.  This patch disables it until Delesley comes up with a
> permanent solution.
>
> Tested on x86_64.  OK for google/main?
>
>
> 2011-07-25  Diego Novillo  <dnovillo@google.com>
>
>        * tree-threadsafe-analyze.c (gate_threadsafe_analyze): Always
>        return false.
>
> 2011-07-25   Diego Novillo  <dnovillo@google.com>
>
>        * gcc/testsuite/g++.dg/dg.exp: Remove tests in directory
>        thread-ann.
>
> Index: gcc/testsuite/g++.dg/dg.exp
> ===================================================================
> --- gcc/testsuite/g++.dg/dg.exp (revision 176640)
> +++ gcc/testsuite/g++.dg/dg.exp (working copy)
> @@ -48,6 +48,7 @@ set tests [prune $tests $srcdir/$subdir/
>  set tests [prune $tests $srcdir/$subdir/torture/*]
>  set tests [prune $tests $srcdir/$subdir/graphite/*]
>  set tests [prune $tests $srcdir/$subdir/guality/*]
> +set tests [prune $tests $srcdir/$subdir/thread-ann/*]
>
>  # Main loop.
>  dg-runtest $tests "" $DEFAULT_CXXFLAGS
> Index: gcc/tree-threadsafe-analyze.c
> ===================================================================
> --- gcc/tree-threadsafe-analyze.c       (revision 176640)
> +++ gcc/tree-threadsafe-analyze.c       (working copy)
> @@ -3571,7 +3571,8 @@ execute_threadsafe_analyze (void)
>  static bool
>  gate_threadsafe_analyze (void)
>  {
> -  return warn_thread_safety != 0;
> +  /* FIXME google/main - Annotalysis is currently broken.  */
> +  return false;
>  }
>
>  struct gimple_opt_pass pass_threadsafe_analyze =
>
> --
> This patch is available for review at http://codereview.appspot.com/4816050
>



-- 
DeLesley Hutchins | Software Engineer | delesley@google.com | 505-206-0315