resource.c (write_resource_constructor): Use expand_expr to generate the address…

resource.c (write_resource_constructor): Use expand_expr to generate the address of the label attached to a resource.

2003-06-10  Andrew Haley  <aph@redhat.com>

        * resource.c (write_resource_constructor): Use expand_expr to
        generate the address of the label attached to a resource.
        * Make-lang.in (java/resource.o): Add expr.h

From-SVN: r67714

gcc/java/ChangeLog

 2003-06-10  Andrew Haley  <aph@redhat.com>
 
+	* resource.c (write_resource_constructor): Use expand_expr to
+	generate the address of the label attached to a resource.
+	* Make-lang.in (java/resource.o): Add expr.h
+
+2003-06-10  Andrew Haley  <aph@redhat.com>
+
 	* lang.c (LANG_HOOKS_DECL_OK_FOR_SIBCALL): New.
 	(java_decl_ok_for_sibcall): New.
 

gcc/java/Make-lang.in

@@ -335,7 +335,7 @@ java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) coretyp
   $(JAVA_LEX_C) java/parse.h java/lex.h input.h
 java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
-  $(TARGET_H) function.h gt-java-resource.h
+  $(TARGET_H) function.h gt-java-resource.h expr.h
 java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
   java/convert.h toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) real.h
 java/win32-host.o: java/win32-host.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h

gcc/java/resource.c

@@ -40,6 +40,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "ggc.h"
 #include "stdio.h"
 #include "target.h"
+#include "expr.h"
 
 /* DOS brain-damage */
 #ifndef O_BINARY
@@ -131,9 +132,9 @@ write_resource_constructor (void)
   for (iter = nreverse (resources); iter != NULL_TREE;
        iter = TREE_CHAIN (iter))
     {
-      const char *name = IDENTIFIER_POINTER (DECL_NAME (TREE_VALUE (iter)));
       emit_library_call (registerResource_libfunc, 0, VOIDmode, 1,
-			 gen_rtx (SYMBOL_REF, Pmode, name),
+			 expand_expr (build_address_of (TREE_VALUE (iter)),
+				      0, Pmode, 0),
 			 Pmode);
     }