Fixes for treelang

Fixes for treelang

[Tim Josling]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]

Committed just now in MAIN. See below. 

Should I also commit a similar patch for the gcc 3.2 tree?

Tim Josling  


+ 2002-08-13  Tim Josling  <tej@melbpc.org.au>
+ 
+       * parse.y: Provide dummy definition of rtx for use by config.h.
+       * Make-lang.in (treetree.o): Remove dependency on non-existent
+       gt-treelang-treelang.h.
+       (gt-treelang-treelang.h): Remove.
+

[-- Attachment #2: temp.diff12.treelang.fix --]
[-- Type: text/plain, Size: 6840 bytes --]

? toplev.c
? gcc/Makefile.in.tim
? gcc/Makefile.in.tim.pg
? gcc/treelang/ChangeLog.tim
Index: gcc/treelang/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/treelang/ChangeLog,v
retrieving revision 1.13
diff -c -r1.13 ChangeLog
*** gcc/treelang/ChangeLog	12 Aug 2002 22:44:30 -0000	1.13
--- gcc/treelang/ChangeLog	13 Aug 2002 08:12:54 -0000
***************
*** 2,7 ****
--- 2,14 ----
  
  	* treelang.c: Remove cpp_post_options.
  
+ 2002-08-13  Tim Josling  <tej@melbpc.org.au>
+ 
+ 	* parse.y: Provide dummy definition of rtx for use by config.h.
+ 	* Make-lang.in (treetree.o): Remove dependency on non-existent
+ 	gt-treelang-treelang.h.
+ 	(gt-treelang-treelang.h): Remove.
+ 
  2002-08-08  Nathan Sidwell  <nathan@codesourcery.com>
  
  	* treelang/Make-lang.in (treelang.mostlyclean): Remove coverage files.
Index: gcc/treelang/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/treelang/Make-lang.in,v
retrieving revision 1.6
diff -c -r1.6 Make-lang.in
*** gcc/treelang/Make-lang.in	8 Aug 2002 09:10:39 -0000	1.6
--- gcc/treelang/Make-lang.in	13 Aug 2002 08:12:55 -0000
***************
*** 92,98 ****
  
  treelang/tree1.o: $(srcdir)/treelang/tree1.c $(srcdir)/treelang/treelang.h \
  	$(srcdir)/treelang/parse.h $(CONFIG_H) \
! 	gt-treelang-tree1.h gt-treelang-treelang.h gtype-treelang.h
  	$(CC) -o $@ -c $(ALL_CFLAGS) $(INCLUDES) $< 
  
  treelang/treetree.o: $(srcdir)/treelang/treetree.c $(srcdir)/treelang/treetree.h \
--- 92,98 ----
  
  treelang/tree1.o: $(srcdir)/treelang/tree1.c $(srcdir)/treelang/treelang.h \
  	$(srcdir)/treelang/parse.h $(CONFIG_H) \
! 	gt-treelang-tree1.h gtype-treelang.h
  	$(CC) -o $@ -c $(ALL_CFLAGS) $(INCLUDES) $< 
  
  treelang/treetree.o: $(srcdir)/treelang/treetree.c $(srcdir)/treelang/treetree.h \
***************
*** 119,125 ****
  	--output=$(srcdir)/treelang/parse.c --defines
  # -v
  
! gt-treelang-tree1.h gt-treelang-treelang.h gtype-treelang.h : s-gtype; @true
  
  #\f
  # Build hooks:
--- 119,125 ----
  	--output=$(srcdir)/treelang/parse.c --defines
  # -v
  
! gt-treelang-tree1.h gtype-treelang.h : s-gtype; @true
  
  #\f
  # Build hooks:
***************
*** 164,169 ****
--- 164,170 ----
  	   if [ -f $$name ] ; then \
  	    name2="`echo \`basename $$name\` | sed -e '$(program_transform_name)' `"; \
  	    rm -f $(bindir)/$$name2$(exeext); \
+ 	    echo $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \
  	    $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \
  	    chmod a+x $(bindir)/$$name2$(exeext); \
  	  fi ; \
Index: gcc/treelang/parse.y
===================================================================
RCS file: /cvs/gcc/gcc/gcc/treelang/parse.y,v
retrieving revision 1.2
diff -c -r1.2 parse.y
*** gcc/treelang/parse.y	10 Jun 2002 00:56:49 -0000	1.2
--- gcc/treelang/parse.y	13 Aug 2002 08:12:56 -0000
***************
*** 42,50 ****
  
     */
  
  #undef IN_GCC
! 
  typedef void *tree;
  
  #include <stdio.h>
  #include <stdlib.h>
--- 42,53 ----
  
     */
  
+ /* Undefine IN_GCC so malloc etc work. The alternative is to redefine
+    the out of stack routine in bison.  */
  #undef IN_GCC
! /* Front ends should not have to see these, but config.h needs everything.  */
  typedef void *tree;
+ typedef void *rtx;
  
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 804,810 ****
  }
  |init {
    /* Nothing to do.  */
! }
  
  init:
  ASSIGN init_element {
--- 807,813 ----
  }
  |init {
    /* Nothing to do.  */
! };
  
  init:
  ASSIGN init_element {
Index: gcc/treelang/treetree.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/treelang/treetree.c,v
retrieving revision 1.8
diff -c -r1.8 treetree.c
*** gcc/treelang/treetree.c	12 Aug 2002 22:44:30 -0000	1.8
--- gcc/treelang/treetree.c	13 Aug 2002 08:12:59 -0000
***************
*** 259,265 ****
        type_node = get_type_for_numeric_type (parm->type);
        type_list = tree_cons (NULL_TREE, type_node, type_list);
      }
!   /* Last parm if null indicates fixed length list (as opposed to
       printf style va_* list).  */
    type_list = tree_cons (NULL_TREE, void_type_node, type_list);
    /* The back end needs them in reverse order.  */
--- 259,265 ----
        type_node = get_type_for_numeric_type (parm->type);
        type_list = tree_cons (NULL_TREE, type_node, type_list);
      }
!   /* Last parm if void indicates fixed length list (as opposed to
       printf style va_* list).  */
    type_list = tree_cons (NULL_TREE, void_type_node, type_list);
    /* The back end needs them in reverse order.  */
***************
*** 855,860 ****
--- 855,865 ----
  int
  maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
                        tree rhs ATTRIBUTE_UNUSED,
+                       int reflexive ATTRIBUTE_UNUSED);
+ 
+ int
+ maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
+                       tree rhs ATTRIBUTE_UNUSED,
                        int reflexive ATTRIBUTE_UNUSED)
  {
    return -1;
***************
*** 881,891 ****
--- 886,909 ----
  /* Tell the c code we are not objective C.  */
  
  tree
+ maybe_building_objc_message_expr (void);
+ 
+ tree
  maybe_building_objc_message_expr ()
  {
    return 0;
  }
  
+ /* Tell the c code we are not objective C.  */
+ 
+ int
+ objc_comptypes (tree lhs ATTRIBUTE_UNUSED, 
+                 tree rhs ATTRIBUTE_UNUSED, 
+                 int reflexive ATTRIBUTE_UNUSED)
+ {
+   return 0;
+ }
+ 
  /* Should not be called for treelang.   */
  
  tree
***************
*** 955,961 ****
  /* Should not be called for treelang.   */
  
  void
! cpp_preprocess_file (cpp_reader *pfile ATTRIBUTE_UNUSED)
  {
    abort ();
  }
--- 973,979 ----
  /* Should not be called for treelang.   */
  
  void
! cpp_post_options (cpp_reader *pfile ATTRIBUTE_UNUSED)
  {
    abort ();
  }
***************
*** 980,987 ****
  
  /* Should not be called for treelang.   */
  
! void
! cpp_finish (cpp_reader *pfile ATTRIBUTE_UNUSED)
  {
    abort ();
  }
--- 998,1005 ----
  
  /* Should not be called for treelang.   */
  
! int
! cpp_finish (cpp_reader *pfile ATTRIBUTE_UNUSED, FILE *f ATTRIBUTE_UNUSED)
  {
    abort ();
  }
***************
*** 1048,1056 ****
--- 1066,1098 ----
  /* Should not be called for treelang.   */
  
  void
+ maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED);
+ 
+ void
  maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED)
  {
    abort ();
+ }
+ 
+ /* Used for objective C.  */
+ 
+ void
+ objc_check_decl (tree decl ATTRIBUTE_UNUSED);
+ 
+ void
+ objc_check_decl (tree decl ATTRIBUTE_UNUSED)
+ {
+ }
+ 
+ /* Tell the c code we are not objective C.  */
+ 
+ tree
+ objc_message_selector (void);
+ 
+ tree
+ objc_message_selector ()
+ {
+   return 0;
  }
  
  /* Should not be called for treelang.   */

Re: Fixes for treelang

[Gerald Pfeifer]

On Tue, 13 Aug 2002, Tim Josling wrote:
> Committed just now in MAIN. See below.
>
> Should I also commit a similar patch for the gcc 3.2 tree?

Only if it fixes a regression, that is, if any released version of GCC
worked where the current version on the 3.2-branch does not work.

(And, of course, only after the release of GCC 3.2 as the branch is
currently frozen.)

Gerald
-- 
Gerald "Jerry" pfeifer@dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/

Re: Fixes for treelang

[Neil Booth]

Tim Josling wrote:-

>   int
>   maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
>                         tree rhs ATTRIBUTE_UNUSED,
> +                       int reflexive ATTRIBUTE_UNUSED);
> + 
> + int
> + maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
> +                       tree rhs ATTRIBUTE_UNUSED,
>                         int reflexive ATTRIBUTE_UNUSED)

Duplicated prototype.  I believe maybe_* is dead.

>   tree
> + maybe_building_objc_message_expr (void);
> + 
> + tree
>   maybe_building_objc_message_expr ()
>   {
>     return 0;
>   }

Ditto; I believe this is dead.

>   void
> ! cpp_preprocess_file (cpp_reader *pfile ATTRIBUTE_UNUSED)
>   {
>     abort ();
>   }
> --- 973,979 ----
>   /* Should not be called for treelang.   */
>   
>   void
> ! cpp_post_options (cpp_reader *pfile ATTRIBUTE_UNUSED)
>   {
>     abort ();
>   }

Hmm.  cpp_post_options is definitely dead.

>   void
> + maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED);
> + 
> + void
>   maybe_objc_check_decl (tree decl ATTRIBUTE_UNUSED)
>   {
>     abort ();
> + }

And again.

Neil.

Re: Fixes for treelang

[Tim Josling]

Neil Booth wrote:
> 
> Tim Josling wrote:-
> 
> >   int
> >   maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
> >                         tree rhs ATTRIBUTE_UNUSED,
> > +                       int reflexive ATTRIBUTE_UNUSED);
> > +
> > + int
> > + maybe_objc_comptypes (tree lhs ATTRIBUTE_UNUSED,
> > +                       tree rhs ATTRIBUTE_UNUSED,
> >                         int reflexive ATTRIBUTE_UNUSED)
> 
> Duplicated prototype.  I believe maybe_* is dead.
> ... (more of same)

Thanks. I'll remove them.

Tim Josling