This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: [PATCH] Java: temporary fix to cope with recent tree.h changes.



Richard Henderson writes:

> Ok.

Thanks. I ended up committing the patch below, after having modified
the gcc/ChangeLog entry and added a comment to gcc/tree.def, following
Mark Mitchell's suggestions.

People with some Java business should make sure to check out both
patches to gcc/tree.def and gcc/java/parse.h at the same time.

./A

Fri Dec 10 16:12:13 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* tree.def (EXPR_WITH_FILE_LOCATION): Temporarily add a third
 	operand, for use in the Java front-end.

Index: tree.def
===================================================================
RCS file: /cvs/gcc/egcs/gcc/tree.def,v
retrieving revision 1.24
diff -u -p -r1.24 tree.def
--- tree.def	1999/12/05 02:42:10	1.24
+++ tree.def	1999/12/12 19:49:40
@@ -794,8 +794,10 @@ DEFTREECODE (EXIT_BLOCK_EXPR, "exit_bloc
    information: a file name (EXPR_WFL_FILENAME);  a line number
    (EXPR_WFL_LINENO); and column number (EXPR_WFL_COLNO).  It is
    expanded as the contained node (EXPR_WFL_NODE);  a line note should
-   be emitted first if EXPR_WFL_EMIT_LINE_NOTE.  */
-DEFTREECODE (EXPR_WITH_FILE_LOCATION, "expr_with_file_location", 'e', 2)
+   be emitted first if EXPR_WFL_EMIT_LINE_NOTE.  
+   The third operand is only used in the Java front-end, and will
+   eventually be removed.  */
+DEFTREECODE (EXPR_WITH_FILE_LOCATION, "expr_with_file_location", 'e', 3)
 
 /* Switch expression.
    Operand 0 is the expression used to perform the branch,

Fri Dec 10 16:13:48 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.h (EXPR_WFL_QUALIFICATION): Temporary uses the third
 	operand of a WFL, until the Java front-end gets fixed with regard
 	to Mark Mitchell's tree.h patch (1999-12-04.)

Index: java/parse.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/parse.h,v
retrieving revision 1.37
diff -u -p -r1.37 parse.h
--- parse.h	1999/12/10 16:06:23	1.37
+++ parse.h	1999/12/12 19:49:42
@@ -487,7 +487,7 @@ typedef struct _jdeplist {
   build_expr_wfl ((NODE), input_filename, EXPR_WFL_LINENO ((WFL)), 	\
 		  EXPR_WFL_COLNO ((WFL)))
 
-#define EXPR_WFL_QUALIFICATION(WFL) TREE_OPERAND ((WFL), 1)
+#define EXPR_WFL_QUALIFICATION(WFL) TREE_OPERAND ((WFL), 2)
 #define QUAL_WFL(NODE) TREE_PURPOSE (NODE)
 #define QUAL_RESOLUTION(NODE) TREE_VALUE (NODE)
 #define QUAL_DECL_TYPE(NODE) GET_SKIP_TYPE (NODE)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]