Move USE_IRANGE from tree-vrp.h into range.h.

From-SVN: r272729

4 files changed, 11 insertions, 14 deletions

diff --git a/gcc/range.h b/gcc/range.h
index 5b10232..59def12 100644
--- a/gcc/range.h
+++ b/gcc/range.h
@@ -21,6 +21,12 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_RANGE_H
 #define GCC_RANGE_H
 
+// Set to one if irange is a standalone class, or zero if irange is
+// just value_range_base underneath.
+#define USE_IRANGE 1
+
+class value_range_base;
+
 #if USE_IRANGE
 // This is the standalone irange implementation.
 
@@ -329,6 +335,10 @@ irange::supports_p (tree expr)
 }
 
 value_range_base irange_to_value_range (const irange &);
+#else // USE_IRANGE
+class value_range_storage;
+typedef value_range_base irange;
+typedef value_range_storage irange_storage;
 #endif // USE_IRANGE
 
 // Common code between the alternate irange implementations.
diff --git a/gcc/ssa.h b/gcc/ssa.h
index 2fe4add..74dcc73 100644
--- a/gcc/ssa.h
+++ b/gcc/ssa.h
@@ -25,8 +25,8 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "stringpool.h"
 #include "gimple-ssa.h"
-#include "tree-vrp.h"
 #include "range.h"
+#include "tree-vrp.h"
 #include "tree-ssanames.h"
 #include "tree-phinodes.h"
 #include "ssa-iterators.h" 
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index f102a89..b4a30ed 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -65,7 +65,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-cfgcleanup.h"
 #include "stringpool.h"
 #include "attribs.h"
-#include "range.h"
 #include "vr-values.h"
 #include "builtins.h"
 #include "wide-int-range.h"
diff --git a/gcc/tree-vrp.h b/gcc/tree-vrp.h
index 1d4fe3b..5d800e0 100644
--- a/gcc/tree-vrp.h
+++ b/gcc/tree-vrp.h
@@ -22,18 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 
 class value_range_storage;
 
-// Set to one if irange is a standalone class, or zero if irange is
-// just value_range_base underneath.
-#define USE_IRANGE 1
-
-#if USE_IRANGE
-class irange;
-#else
-class value_range_base;
-typedef value_range_base irange;
-typedef value_range_storage irange_storage;
-#endif
-
 /* Range of values that can be associated with an SSA_NAME after VRP
    has executed.  */
 class GTY((for_user)) value_range_base