From d9338cf00c16a6fe2e9fdc702ab5f0fcfd1b6abf Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Tue, 15 Apr 2008 15:41:52 +0000
Subject: [PATCH] params.def (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE): Set
 default to zero, thus disable creation of SFTs.

2008-04-15  Richard Guenther  <rguenther@suse.de>

	* params.def (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE): Set default
	to zero, thus disable creation of SFTs.

	* gcc.dg/tree-ssa/salias-1.c: Remove.
	* gcc.dg/tree-ssa/pr26421.c: Adjust pattern.
	* gcc.dg/tree-ssa/alias-15.c: Likewise.
	* gcc.dg/tree-ssa/ssa-lim-3.c: Run at -O2.

From-SVN: r134321
---
 gcc/ChangeLog                             |  5 +++++
 gcc/params.def                            |  2 +-
 gcc/testsuite/ChangeLog                   |  7 +++++++
 gcc/testsuite/gcc.dg/tree-ssa/alias-15.c  |  5 ++---
 gcc/testsuite/gcc.dg/tree-ssa/pr26421.c   |  4 +++-
 gcc/testsuite/gcc.dg/tree-ssa/salias-1.c  | 19 -------------------
 gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c |  2 +-
 7 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.dg/tree-ssa/salias-1.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb298373de8..f2bf992b1d8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-15  Richard Guenther  <rguenther@suse.de>
+
+	* params.def (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE): Set default
+	to zero, thus disable creation of SFTs.
+
 2008-04-15  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* tree-predcom.c (suitable_reference_p): Return false if the
diff --git a/gcc/params.def b/gcc/params.def
index 0428c3120af..471b9533f38 100644
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -652,7 +652,7 @@ DEFPARAM (PARAM_MAX_JUMP_THREAD_DUPLICATION_STMTS,
 DEFPARAM (PARAM_MAX_FIELDS_FOR_FIELD_SENSITIVE,
           "max-fields-for-field-sensitive",
 	  "Maximum number of fields in a structure before pointer analysis treats the structure as a single variable",
-	  100, 0, 0)
+	  0, 0, 0)
 
 DEFPARAM(PARAM_MAX_SCHED_READY_INSNS,
 	 "max-sched-ready-insns",
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 646e5455e40..aa9fe4770a5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-15  Richard Guenther  <rguenther@suse.de>
+
+	* gcc.dg/tree-ssa/salias-1.c: Remove.
+	* gcc.dg/tree-ssa/pr26421.c: Adjust pattern.
+	* gcc.dg/tree-ssa/alias-15.c: Likewise.
+	* gcc.dg/tree-ssa/ssa-lim-3.c: Run at -O2.
+
 2008-04-15  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/loop_optimization1.ad[sb]: New test.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-15.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-15.c
index 4155b030c88..a8f61153231 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-15.c
@@ -11,10 +11,9 @@ static inline struct X *wrap(struct X *p) { return p; }
 int test2(void)
 {
   struct X *p = wrap(&m.b);
-  /* Both memory references need to alias the same SFT.  */
+  /* Both memory references need to alias the same tags.  */
   return p->b[3] - m.b.b[3];
 }
 
-/* { dg-final { scan-tree-dump "SFT.5 created for var m offset 128" "salias" } } */
-/* { dg-final { scan-tree-dump-times "VUSE <SFT.5_" 2 "salias" } } */
+/* { dg-final { scan-tree-dump-times "VUSE <m_.\\\(D\\\)>" 2 "salias" } } */
 /* { dg-final { cleanup-tree-dump "salias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c b/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
index ef5bc6a5341..2b2f497bd4b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
@@ -16,5 +16,7 @@ int foo(void)
   return a.i;
 }
 
-/* { dg-final { scan-tree-dump-times "VDEF" 4 "salias" } } */
+/* Verify the call clobbers all of a.  */
+
+/* { dg-final { scan-tree-dump-times "VDEF <a_" 2 "salias" } } */
 /* { dg-final { cleanup-tree-dump "salias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/salias-1.c b/gcc/testsuite/gcc.dg/tree-ssa/salias-1.c
deleted file mode 100644
index 5e47db40a73..00000000000
--- a/gcc/testsuite/gcc.dg/tree-ssa/salias-1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-salias" } */
-
-struct {
-  struct {
-    struct {
-	int i, j;
-    } c;
-  } b;
-} a;
-
-int foo(void)
-{
-  a.b.c.i = 0;
-  return a.b.c.j;
-}
-
-/* { dg-final { scan-tree-dump-times "structure field tag SFT" 2 "salias" } } */
-/* { dg-final { cleanup-tree-dump "salias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
index 91956017898..b88a1e58af6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fdump-tree-lim-details" } */
+/* { dg-options "-O2 -fdump-tree-lim-details" } */
 
 struct { int x; int y; } global;
 void foo(int n)
-- 
2.30.2