Merge from mainlinebefore_gc_merge_990902egcs_gc_branch

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/egcs_gc_branch@26036 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 18 insertions, 6 deletions

diff --git a/gcc/testsuite/gcc.c-torture/execute/bcp-1.c b/gcc/testsuite/gcc.c-torture/execute/bcp-1.c
index 1eafec5beb9..38b1d3e8e93 100644
--- a/gcc/testsuite/gcc.c-torture/execute/bcp-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/bcp-1.c
@@ -11,6 +11,7 @@ inline int bad6(int x) { return __builtin_constant_p(x+1); }
 int bad7(void) { return __builtin_constant_p(abort()); }
 int bad8(void) { char buf[10]; return __builtin_constant_p(buf); }
 int bad9(const char *x) { return __builtin_constant_p(x[123456]); }
+int bad10(void) { return __builtin_constant_p(&global); }
 
 /* These must pass, or we've broken gcc2 functionality.  */
 int good0(void) { return __builtin_constant_p(1); }
@@ -20,14 +21,25 @@ int good2(void) { return __builtin_constant_p((1234 + 45) & ~7); }
 /* These are extensions to gcc2.  Failure indicates an optimization
    regression.  */
 int opt0(void) { return bad3(1); }
-int opt1(void) { return bad4("hi"); }
-int opt2(void) { return bad6(1); }
-int opt3(void) { return __builtin_constant_p(&global); }
-int opt4(void) { return __builtin_constant_p("hi"[0]); }
+int opt1(void) { return bad6(1); }
+int opt2(void) { return __builtin_constant_p("hi"[0]); }
+
+/* 
+ * Opt3 is known to fail.  It is one of the important cases that glibc
+ * was interested in though, so keep this around as a reminder.
+ *
+ * The solution is to add bits to recover bytes from constant pool
+ * elements given nothing but a constant pool label and an offset.
+ * When we can do that, and we can simplify strlen after the fact,
+ * then we can enable recognition of constant pool labels as constants.
+ */
+
+/* int opt3(void) { return bad4("hi"); } */
+
 
 /* Call through tables so -finline-functions can't screw with us.  */
 int (*bad_t0[])(void) = {
-	bad0, bad1, bad5, bad7, bad8
+	bad0, bad1, bad5, bad7, bad8, bad10
 };
 
 int (*bad_t1[])(int x) = {
@@ -43,7 +55,7 @@ int (*good_t0[])(void) = {
 };
 
 int (*opt_t0[])(void) = {
-	opt0, opt1, opt2, opt3, opt4
+	opt0, opt1, opt2 /* , opt3 */
 };
 
 #define N(arr) (sizeof(arr)/sizeof(*arr))