aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Kenner <kenner@vlsi1.ultra.nyu.edu>2001-11-28 16:55:59 +0000
committerRichard Kenner <kenner@gcc.gnu.org>2001-11-28 11:55:59 -0500
commitf724a9d2e269b32ac8c9e5dd3de126d4b9d71d05 (patch)
treed1025c495889f640f770e69afa7a309d10443a0a
parent3e87ad4df7a6f0221cc03ec32a23074577a603f4 (diff)
downloadgcc-f724a9d2e269b32ac8c9e5dd3de126d4b9d71d05.zip
gcc-f724a9d2e269b32ac8c9e5dd3de126d4b9d71d05.tar.gz
gcc-f724a9d2e269b32ac8c9e5dd3de126d4b9d71d05.tar.bz2
tree.h (EXPR_WFL_LINECOL): Used by Java in node other than EXPR_WITH_FILE_LOCATION...
* tree.h (EXPR_WFL_LINECOL): Used by Java in node other than EXPR_WITH_FILE_LOCATION, so change checks and documentation. From-SVN: r47420
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/tree.h13
2 files changed, 9 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b254b7..849630b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
Wed Nov 28 08:21:47 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
+ * tree.h (EXPR_WFL_LINECOL): Used by Java in node other than
+ EXPR_WITH_FILE_LOCATION, so change checks and documentation.
+
* tree.h (TREE_VIA_PROTECTED): Update to show can be in TREE_VEC.
* tree.h: Add missing checks on some macros; make formatting more
diff --git a/gcc/tree.h b/gcc/tree.h
index 2fa0fc6..859a564 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -830,21 +830,20 @@ struct tree_vec
#define LOOP_EXPR_BODY(NODE) TREE_OPERAND (LOOP_EXPR_CHECK (NODE), 0)
/* In a EXPR_WITH_FILE_LOCATION node. */
+#define EXPR_WFL_EMIT_LINE_NOTE(NODE) \
+ (EXPR_WITH_FILE_LOCATION_CHECK (NODE)->common.public_flag)
#define EXPR_WFL_NODE(NODE) \
TREE_OPERAND (EXPR_WITH_FILE_LOCATION_CHECK (NODE), 0)
#define EXPR_WFL_FILENAME_NODE(NODE) \
TREE_OPERAND(EXPR_WITH_FILE_LOCATION_CHECK (NODE), 1)
#define EXPR_WFL_FILENAME(NODE) \
IDENTIFIER_POINTER (EXPR_WFL_FILENAME_NODE ((NODE)))
-#define EXPR_WFL_LINENO(NODE) \
- (EXPR_WITH_FILE_LOCATION_CHECK (NODE)->exp.complexity >> 12)
-#define EXPR_WFL_COLNO(NODE) \
- (EXPR_WITH_FILE_LOCATION_CHECK (NODE)->exp.complexity & 0xfff)
-#define EXPR_WFL_LINECOL(NODE) \
- EXPR_WITH_FILE_LOCATION_CHECK (NODE)->exp.complexity
+/* ??? Java uses this in all expressions. */
+#define EXPR_WFL_LINECOL(NODE) (EXPR_CHECK (NODE)->exp.complexity)
+#define EXPR_WFL_LINENO(NODE) (EXPR_WFL_LINECOL (NODE) >> 12)
+#define EXPR_WFL_COLNO(NODE) (EXPR_WFL_LINECOL (NODE) & 0xfff)
#define EXPR_WFL_SET_LINECOL(NODE, LINE, COL) \
(EXPR_WFL_LINECOL(NODE) = ((LINE) << 12) | ((COL) & 0xfff))
-#define EXPR_WFL_EMIT_LINE_NOTE(NODE) ((NODE)->common.public_flag)
struct tree_exp
{