This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[tuples] remove gimple-dummy.c
- From: Aldy Hernandez <aldyh at redhat dot com>
- To: dnovillo at google dot com, jakub at redhat dot com, gcc-patches at gcc dot gnu dot org
- Date: Tue, 15 Jul 2008 05:33:04 -0400
- Subject: [tuples] remove gimple-dummy.c
We no longer have dummy calls. Yay.
Committing to branch.
* Makefile.in (gimple-dummy.o): Remove.
* gimple-dummy.c: Delete.
* tree-ssa-propagate.c (valid_gimple_expression_p): Change
gimple_unreachable to gcc_unreachable.
* tree-affine.c (aff_combination_expand): Same.
* tree-vect-transform.c (vectorizable_call): Same.
Index: tree-ssa-propagate.c
===================================================================
--- tree-ssa-propagate.c (revision 137793)
+++ tree-ssa-propagate.c (working copy)
@@ -549,7 +549,7 @@ ssa_prop_fini (void)
bool
valid_gimple_expression_p (tree expr ATTRIBUTE_UNUSED)
{
- gimple_unreachable ();
+ gcc_unreachable ();
return false;
}
Index: gimple-dummy.c
===================================================================
--- gimple-dummy.c (revision 137793)
+++ gimple-dummy.c (working copy)
@@ -1,42 +0,0 @@
-/* FIXME tuples. HACK. HACK. HACK.
-
- This file defines a collection symbols that have been if0'd out
- during the conversion to GIMPLE tuples. As the various passes get
- re-enabled, these symbols should be removed. */
-
-#include "config.h"
-#include "system.h"
-
-#define DUMMY_VAR(X) \
- int X
-
-#define DUMMY_FN(X) \
- void X (void); \
- void X (void) { gcc_unreachable (); }
-
-/* Note that we should mark gimple_unreachable_1 with
- ATTRIBUTE_NORETURN. But the function will sometimes return, so we
- need to turn off the return warning in the Makefiles for now.
-
- We also manually declare flag_gimple_conversion to avoid having to
- pull in many standard header files. The whole setup here is a
- giant hack, so this needs to be as self-contained as possible. */
-extern void gimple_unreachable_1 (const char *, int, const char *);
-extern int flag_gimple_conversion;
-
-void
-gimple_unreachable_1 (const char *file, int line, const char *fn)
-{
- if (flag_gimple_conversion == 0)
- return;
-
- fprintf (stderr, "%s:%s(%d): GIMPLE conversion ", file, fn, line);
-
- if (flag_gimple_conversion == 1)
- fprintf (stderr, "warning: Executing unconverted code\n");
- else
- {
- fprintf (stderr, "error: Executing unconverted code\n");
- gcc_unreachable ();
- }
-}
Index: tree-affine.c
===================================================================
--- tree-affine.c (revision 137794)
+++ tree-affine.c (working copy)
@@ -667,7 +667,7 @@ aff_combination_expand (aff_tree *comb A
}
aff_combination_add (comb, &to_add);
#else
- gimple_unreachable ();
+ gcc_unreachable ();
#endif
}
Index: tree-vect-transform.c
===================================================================
--- tree-vect-transform.c (revision 137793)
+++ tree-vect-transform.c (working copy)
@@ -3343,7 +3343,7 @@ vectorizable_call (gimple stmt, gimple_s
type = TREE_TYPE (scalar_dest);
/* FIXME tuples */
#if 1
- gimple_unreachable ();
+ gcc_unreachable ();
#else
GIMPLE_STMT_OPERAND (stmt, 1) = fold_convert (type, integer_zero_node);
#endif
Index: Makefile.in
===================================================================
--- Makefile.in (revision 137793)
+++ Makefile.in (working copy)
@@ -1238,8 +1238,7 @@ OBJS-common = \
version.o \
vmsdbgout.o \
web.o \
- xcoffout.o \
- gimple-dummy.o # FIXME tuples. Do not merge.
+ xcoffout.o
# Target object files.
OBJS-md = $(out_object_file)
@@ -2346,8 +2345,6 @@ tree-gimple.o : tree-gimple.c $(CONFIG_H
gimple.o : gimple.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
$(GGC_H) $(TREE_GIMPLE_H) $(GIMPLE_H) $(DIAGNOSTIC_H) gt-gimple.h \
$(TREE_FLOW_H) value-prof.h $(FLAGS_H)
-# FIXME tuples. Do not merge.
-gimple-dummy.o: gimple-dummy.c $(CONFIG_H) $(SYSTEM_H)
gimple-pretty-print.o : gimple-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \
$(TREE_H) $(DIAGNOSTIC_H) $(REAL_H) $(HASHTAB_H) $(TREE_FLOW_H) \
$(TM_H) coretypes.h tree-pass.h $(GIMPLE_H) value-prof.h