X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fjava%2Fjcf-parse.c;h=08d51364fb386c2240f79bbdaad8e5f815796785;hp=d62b1b8f32557cee058b3e895ac78d993cf073d1;hb=d45e1e6e1a18f6716de168b35aa594666410a7e1;hpb=7c446c951a941facd5f225bba9916ff669420c34

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index d62b1b8f325..08d51364fb3 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1,12 +1,12 @@
 /* Parser for Java(TM) .class files.
-   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GCC is distributed in the hope that it will be useful,
@@ -15,9 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.
 
 Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
@@ -35,6 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "java-except.h"
 #include "input.h"
+#include "javaop.h"
 #include "java-tree.h"
 #include "toplev.h"
 #include "parse.h"
@@ -43,6 +43,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "assert.h"
 #include "tm_p.h"
 #include "cgraph.h"
+#include "vecprim.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
@@ -80,29 +81,41 @@ static GTY(()) tree parse_roots[3];
 /* The METHOD_DECL for the current method.  */
 #define current_method parse_roots[1]
 
-/* A list of file names.  */
+/* A list of TRANSLATION_UNIT_DECLs for the files to be compiled.  */
 #define current_file_list parse_roots[2]
 
+/* Line 0 in current file, if compiling from bytecode. */
+static location_t file_start_location;
+
 /* The Java archive that provides main_class;  the main input file. */
 static GTY(()) struct JCF * main_jcf;
 
+/* The number of source files passed to us by -fsource-filename and an
+   array of pointers to each name.  Used by find_sourcefile().  */
+static int num_files = 0;
+static char **filenames;
+
 static struct ZipFile *localToFile;
 
+/* A map of byte offsets in the reflection data that are fields which
+   need renumbering.  */
+bitmap field_offsets;
+bitmap_obstack bit_obstack;
+
 /* Declarations of some functions used here.  */
-static void handle_innerclass_attribute (int count, JCF *);
+static void handle_innerclass_attribute (int count, JCF *, int len);
 static tree give_name_to_class (JCF *jcf, int index);
 static char *compute_class_name (struct ZipDirectory *zdir);
 static int classify_zip_file (struct ZipDirectory *zdir);
 static void parse_zip_file_entries (void);
 static void process_zip_dir (FILE *);
-static void parse_source_file_1 (tree, FILE *);
-static void parse_source_file_2 (void);
-static void parse_source_file_3 (void);
 static void parse_class_file (void);
 static void handle_deprecated (void);
 static void set_source_filename (JCF *, int);
 static void jcf_parse (struct JCF*);
 static void load_inner_classes (tree);
+static void handle_annotation (JCF *jcf, int level);
+static void java_layout_seen_class_methods (void);
 
 /* Handle "Deprecated" attribute.  */
 static void
@@ -117,10 +130,185 @@ handle_deprecated (void)
   else
     {
       /* Shouldn't happen.  */
-      abort ();
+      gcc_unreachable ();
+    }
+}
+
+
+
+/* Reverse a string.  */
+static char *
+reverse (const char *s)
+{
+  if (s == NULL)
+    return NULL;
+  else
+    {
+      int len = strlen (s);
+      char *d = xmalloc (len + 1);
+      const char *sp;
+      char *dp;
+      
+      d[len] = 0;
+      for (dp = &d[0], sp = &s[len-1]; sp >= s; dp++, sp--)
+	*dp = *sp;
+
+      return d;
+    }
+}
+
+/* Compare two strings for qsort().  */
+static int
+cmpstringp (const void *p1, const void *p2)
+{
+  /* The arguments to this function are "pointers to
+     pointers to char", but strcmp() arguments are "pointers
+     to char", hence the following cast plus dereference */
+
+  return strcmp(*(const char *const*) p1, *(const char *const*) p2);
+}
+
+/* Create an array of strings, one for each source file that we've
+   seen.  fsource_filename can either be the name of a single .java
+   file or a file that contains a list of filenames separated by
+   newlines.  */
+void 
+java_read_sourcefilenames (const char *fsource_filename)
+{
+  if (fsource_filename 
+      && filenames == 0
+      && strlen (fsource_filename) > strlen (".java")
+      && strcmp ((fsource_filename 
+		  + strlen (fsource_filename)
+		  - strlen (".java")),
+		 ".java") != 0)
+    {
+/*       fsource_filename isn't a .java file but a list of filenames
+       separated by newlines */
+      FILE *finput = fopen (fsource_filename, "r");
+      int len = 0;
+      int longest_line = 0;
+
+      gcc_assert (finput);
+
+      /* Find out how many files there are, and how long the filenames are.  */
+      while (! feof (finput))
+	{
+	  int ch = getc (finput);
+	  if (ch == '\n')
+	    {
+	      num_files++;
+	      if (len > longest_line)
+		longest_line = len;
+	      len = 0;
+	      continue;
+	    }
+	  if (ch == EOF)
+	    break;
+	  len++;
+	}
+
+      rewind (finput);
+
+      /* Read the filenames.  Put a pointer to each filename into the
+	 array FILENAMES.  */
+      {
+	char *linebuf = alloca (longest_line + 1);
+	int i = 0;
+	int charpos;
+
+	filenames = xmalloc (num_files * sizeof (char*));
+
+	charpos = 0;
+	for (;;)
+	  {
+	    int ch = getc (finput);
+	    if (ch == EOF)
+	      break;
+	    if (ch == '\n')
+	      {
+		linebuf[charpos] = 0;
+		gcc_assert (i < num_files);		
+		/* ???  Perhaps we should use lrealpath() here.  Doing
+		   so would tidy up things like /../ but the rest of
+		   gcc seems to assume relative pathnames, not
+		   absolute pathnames.  */
+/* 		realname = lrealpath (linebuf); */
+		filenames[i++] = reverse (linebuf);
+		charpos = 0;
+		continue;
+	      }
+	    gcc_assert (charpos < longest_line);
+	    linebuf[charpos++] = ch;
+	  }
+
+	if (num_files > 1)
+	  qsort (filenames, num_files, sizeof (char *), cmpstringp);
+      }
+      fclose (finput);
+    }
+  else
+    {
+      filenames = xmalloc (sizeof (char*));      
+      filenames[0] = reverse (fsource_filename);
+      num_files = 1;
+    }
+}
+
+/* Given a relative pathname such as foo/bar.java, attempt to find a
+   longer pathname with the same suffix.  
+
+   This is a best guess heuristic; with some weird class hierarchies we
+   may fail to pick the correct source file.  For example, if we have
+   the filenames foo/bar.java and also foo/foo/bar.java, we do not
+   have enough information to know which one is the right match for
+   foo/bar.java.  */
+
+static const char *
+find_sourcefile (const char *name)
+{
+  int i = 0, j = num_files-1;
+  char *found = NULL;
+  
+  if (filenames)
+    {
+      char *revname = reverse (name);
+
+      do
+	{
+	  int k = (i+j) / 2;
+	  int cmp = strncmp (revname, filenames[k], strlen (revname));
+	  if (cmp == 0)
+	    {
+	      /*  OK, so we found one.  But is it a unique match?  */
+	      if ((k > i
+		   && strncmp (revname, filenames[k-1], strlen (revname)) == 0)
+		  || (k < j
+		      && (strncmp (revname, filenames[k+1], strlen (revname)) 
+			  == 0)))
+		;
+	      else
+		found = filenames[k];
+	      break;
+	    }
+	  if (cmp > 0)
+	    i = k+1;
+	  else
+	    j = k-1;
+	}
+      while (i <= j);
+
+      free (revname);
     }
+
+  if (found && strlen (found) > strlen (name))
+    return reverse (found);
+  else
+    return name;
 }
 
+
+
 /* Handle "SourceFile" attribute. */
 
 static void
@@ -128,23 +316,577 @@ set_source_filename (JCF *jcf, int index)
 {
   tree sfname_id = get_name_constant (jcf, index);
   const char *sfname = IDENTIFIER_POINTER (sfname_id);
-  if (input_filename != NULL)
+  const char *old_filename = input_filename;
+  int new_len = IDENTIFIER_LENGTH (sfname_id);
+  if (old_filename != NULL)
     {
-      int old_len = strlen (input_filename);
-      int new_len = IDENTIFIER_LENGTH (sfname_id);
+      int old_len = strlen (old_filename);
       /* Use the current input_filename (derived from the class name)
 	 if it has a directory prefix, but otherwise matches sfname. */
       if (old_len > new_len
-	  && strcmp (sfname, input_filename + old_len - new_len) == 0
-	  && (input_filename[old_len - new_len - 1] == '/'
-	      || input_filename[old_len - new_len - 1] == '\\'))
-	return;
+	  && strcmp (sfname, old_filename + old_len - new_len) == 0
+	  && (old_filename[old_len - new_len - 1] == '/'
+	      || old_filename[old_len - new_len - 1] == '\\'))
+	{
+#ifndef USE_MAPPED_LOCATION
+	  input_filename = find_sourcefile (input_filename);
+	  DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
+	  file_start_location = input_location;
+#endif
+	  return;
+	}
+    }
+  if (strchr (sfname, '/') == NULL && strchr (sfname, '\\') == NULL)
+    {
+      const char *class_name
+	= IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class)));
+      char *dot = strrchr (class_name, '.');
+      if (dot != NULL)
+	{
+	  /* Length of prefix, not counting final dot. */
+	  int i = dot - class_name;
+	  /* Concatenate current package prefix with new sfname. */
+	  char *buf = XNEWVEC (char, i + new_len + 2); /* Space for '.' and '\0'. */
+	  strcpy (buf + i + 1, sfname);
+	  /* Copy package from class_name, replacing '.' by DIR_SEPARATOR.
+	     Note we start at the end with the final package dot. */
+	  for (; i >= 0;  i--)
+	    {
+	      char c = class_name[i];
+	      if (c == '.')
+		c = DIR_SEPARATOR;
+	      buf[i] = c;
+	    }
+	  sfname_id = get_identifier (buf);
+	  free (buf);
+	  sfname = IDENTIFIER_POINTER (sfname_id);
+	}
     }
+      
+  sfname = find_sourcefile (sfname);
+#ifdef USE_MAPPED_LOCATION
+  line_table.maps[line_table.used-1].to_file = sfname;
+#else
   input_filename = sfname;
-  DECL_SOURCE_FILE (TYPE_NAME (current_class)) = sfname;
-  if (current_class == main_class) main_input_filename = input_filename;
+  DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
+  file_start_location = input_location;
+#endif
+  if (current_class == main_class) main_input_filename = sfname;
+}
+
+
+
+
+/* Annotation handling.  
+
+   The technique we use here is to copy the annotation data directly
+   from the input class file into the output file.  We don't decode the
+   data at all, merely rewriting constant indexes whenever we come
+   across them: this is necessary because the constant pool in the
+   output file isn't the same as the constant pool in in the input.
+
+   The main advantage of this technique is that the resulting
+   annotation data is pointer-free, so it doesn't have to be relocated
+   at startup time.  As a consequence of this, annotations have no
+   performance impact unless they are used.  Also, this representation
+   is very dense.  */
+
+
+/* Expand TYPE_REFLECTION_DATA by DELTA bytes.  Return the address of
+   the start of the newly allocated region.  */
+
+static unsigned char*
+annotation_grow (int delta)
+{
+  unsigned char **data = &TYPE_REFLECTION_DATA (current_class);
+  long *datasize = &TYPE_REFLECTION_DATASIZE (current_class);
+  long len = *datasize;
+
+  if (*data == NULL)
+    {
+      *data = xmalloc (delta);
+    }
+  else
+    {
+      int newlen = *datasize + delta;
+      if (floor_log2 (newlen) != floor_log2 (*datasize))
+	*data = xrealloc (*data,  2 << (floor_log2 (newlen)));
+    }
+  *datasize += delta;
+  return *data + len;
+}
+
+/* annotation_rewrite_TYPE.  Rewrite various int types at p.  Use Java
+   byte order (i.e. big endian.)  */
+
+static void
+annotation_rewrite_byte (unsigned int n, unsigned char *p)
+{
+  p[0] = n;
 }
 
+static void
+annotation_rewrite_short (unsigned int n, unsigned char *p)
+{
+  p[0] = n>>8;
+  p[1] = n;
+}
+
+static void
+annotation_rewrite_int (unsigned int n, unsigned char *p)
+{
+  p[0] = n>>24;
+  p[1] = n>>16;
+  p[2] = n>>8;
+  p[3] = n;
+}
+
+/* Read a 16-bit unsigned int in Java byte order (i.e. big
+   endian.)  */
+
+static uint16
+annotation_read_short (unsigned char *p)
+{
+  uint16 tmp = p[0];
+  tmp = (tmp << 8) | p[1];
+  return tmp;
+}
+
+/* annotation_write_TYPE.  Rewrite various int types, appending them
+   to TYPE_REFLECTION_DATA.  Use Java byte order (i.e. big
+   endian.)  */
+
+static void
+annotation_write_byte (unsigned int n)
+{
+  annotation_rewrite_byte (n, annotation_grow (1));
+}
+
+static void
+annotation_write_short (unsigned int n)
+{
+  annotation_rewrite_short (n, annotation_grow (2));
+}
+
+static void
+annotation_write_int (unsigned int n)
+{
+  annotation_rewrite_int (n, annotation_grow (4));
+}
+
+/* Create a 64-bit constant in the constant pool.
+
+   This is used for both integer and floating-point types.  As a
+   consequence, it will not work if the target floating-point format
+   is anything other than IEEE-754.  While this is arguably a bug, the
+   runtime library makes exactly the same assumption and it's unlikely
+   that Java will ever run on a non-IEEE machine.  */
+
+static int 
+handle_long_constant (JCF *jcf, CPool *cpool, enum cpool_tag kind,
+		    int index, bool big_endian)
+{
+  /* If we're on a 64-bit platform we can fit a long or double
+     into the same space as a jword.  */
+  if (POINTER_SIZE >= 64)
+    index = find_constant1 (cpool, kind, JPOOL_LONG (jcf, index));
+
+  /* In a compiled program the constant pool is in native word
+     order.  How weird is that???  */
+  else if (big_endian)
+    index = find_constant2 (cpool, kind,
+			    JPOOL_INT (jcf, index), 
+			    JPOOL_INT (jcf, index+1));
+  else
+    index = find_constant2 (cpool, kind,
+			    JPOOL_INT (jcf, index+1), 
+			    JPOOL_INT (jcf, index));
+  
+  return index;
+}
+
+/* Given a class file and an index into its constant pool, create an
+   entry in the outgoing constant pool for the same item.  */
+
+static uint16
+handle_constant (JCF *jcf, int index, enum cpool_tag purpose)
+{
+  enum cpool_tag kind;
+  CPool *cpool = cpool_for_class (output_class);
+  
+  if (index == 0)
+    return 0;
+
+  if (! CPOOL_INDEX_IN_RANGE (&jcf->cpool, index))
+    error ("<constant pool index %d not in range>", index);
+  
+  kind = JPOOL_TAG (jcf, index);
+
+  if ((kind & ~CONSTANT_ResolvedFlag) != purpose)
+    {
+      if (purpose == CONSTANT_Class
+	  && kind == CONSTANT_Utf8)
+	;
+      else
+	error ("<constant pool index %d unexpected type", index);
+    }
+
+  switch (kind)
+    {
+    case CONSTANT_Class:
+    case CONSTANT_ResolvedClass:
+      {
+	/* For some reason I know not the what of, class names in
+	   annotations are UTF-8 strings in the constant pool but
+	   class names in EnclosingMethod attributes are real class
+	   references.  Set CONSTANT_LazyFlag here so that the VM
+	   doesn't attempt to resolve them at class initialization
+	   time.  */
+	tree resolved_class, class_name;
+	resolved_class = get_class_constant (jcf, index);
+	class_name = build_internal_class_name (resolved_class);
+	index = alloc_name_constant (CONSTANT_Class | CONSTANT_LazyFlag,
+				     (unmangle_classname 
+				      (IDENTIFIER_POINTER(class_name),
+				       IDENTIFIER_LENGTH(class_name))));
+	break;
+      }
+    case CONSTANT_Utf8:
+      {
+	tree utf8 = get_constant (jcf, index);
+	if (purpose == CONSTANT_Class)
+	  /* Create a constant pool entry for a type signature.  This
+	     one has '.' rather than '/' because it isn't going into a
+	     class file, it's going into a compiled object.
+	     
+	     This has to match the logic in
+	     _Jv_ClassReader::prepare_pool_entry().  */
+	  utf8 = unmangle_classname (IDENTIFIER_POINTER(utf8),
+				     IDENTIFIER_LENGTH(utf8));
+	index = alloc_name_constant (kind, utf8);
+      }
+      break;
+
+    case CONSTANT_Long:
+      index = handle_long_constant (jcf, cpool, kind, index, 
+				    WORDS_BIG_ENDIAN);
+      break;
+      
+    case CONSTANT_Double:
+      index = handle_long_constant (jcf, cpool, kind, index, 
+				    FLOAT_WORDS_BIG_ENDIAN);
+      break;
+
+    case CONSTANT_Float:
+    case CONSTANT_Integer:
+      index = find_constant1 (cpool, kind, JPOOL_INT (jcf, index));
+      break;
+      
+    case CONSTANT_NameAndType:
+      {
+	uint16 name = JPOOL_USHORT1 (jcf, index);
+	uint16 sig = JPOOL_USHORT2 (jcf, index);
+	uint32 name_index = handle_constant (jcf, name, CONSTANT_Utf8);
+	uint32 sig_index = handle_constant (jcf, sig, CONSTANT_Class);
+	jword new_index = (name_index << 16) | sig_index;
+	index = find_constant1 (cpool, kind, new_index);
+      }
+      break;
+
+    default:
+      abort ();
+    }
+  
+  return index;
+}
+
+/* Read an element_value structure from an annotation in JCF.  Return
+   the constant pool index for the resulting constant pool entry.  */
+
+static int
+handle_element_value (JCF *jcf, int level)
+{
+  uint8 tag = JCF_readu (jcf);
+  int index = 0;
+
+  annotation_write_byte (tag);
+  switch (tag)
+    {
+    case 'B':
+    case 'C':
+    case 'S':
+    case 'Z':
+    case 'I':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Integer);
+	annotation_write_short (index);
+      }
+      break;
+    case 'D':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Double);
+	annotation_write_short (index);
+      }
+      break;
+    case 'F':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Float);
+	annotation_write_short (index);
+      }
+      break;
+    case 'J':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Long);
+	annotation_write_short (index);
+      }
+      break;
+    case 's':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	/* Despite what the JVM spec says, compilers generate a Utf8
+	   constant here, not a String.  */
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Utf8);
+	annotation_write_short (index);
+      }
+      break;
+
+    case 'e':
+      {
+	uint16 type_name_index = JCF_readu2 (jcf);
+	uint16 const_name_index = JCF_readu2 (jcf);
+	index = handle_constant (jcf, type_name_index,
+				 CONSTANT_Class);
+	annotation_write_short (index);
+	index = handle_constant (jcf, const_name_index,
+				 CONSTANT_Utf8);
+	annotation_write_short (index);
+     }
+      break;
+    case 'c':
+      {
+	uint16 class_info_index = JCF_readu2 (jcf);
+	index = handle_constant (jcf, class_info_index,
+				 CONSTANT_Class);
+	annotation_write_short (index);
+      }
+      break;
+    case '@':
+      {
+	handle_annotation (jcf, level + 1);
+      }
+      break;
+    case '[':
+      {
+	uint16 n_array_elts = JCF_readu2 (jcf);
+	annotation_write_short (n_array_elts);
+	while (n_array_elts--)
+	  handle_element_value (jcf, level + 1);
+      }
+      break;
+    default:
+      abort();
+      break;
+    }
+  return index;
+}
+
+/* Read an annotation structure from JCF.  Write it to the
+   reflection_data field of the outgoing class.  */
+
+static void
+handle_annotation (JCF *jcf, int level)
+{
+  uint16 type_index = JCF_readu2 (jcf);
+  uint16 npairs = JCF_readu2 (jcf);
+  int index = handle_constant (jcf, type_index,
+			       CONSTANT_Class);
+  annotation_write_short (index);
+  annotation_write_short (npairs);
+  while (npairs--)
+    {
+      uint16 name_index = JCF_readu2 (jcf);
+      index = handle_constant (jcf, name_index,
+			       CONSTANT_Utf8);
+      annotation_write_short (index);
+      handle_element_value (jcf, level + 2);
+    }
+}
+
+/* Read an annotation count from JCF, and write the following
+   annotations to the reflection_data field of the outgoing class.  */
+
+static void
+handle_annotations (JCF *jcf, int level)
+{
+  uint16 num = JCF_readu2 (jcf);
+  annotation_write_short (num);
+  while (num--)
+    handle_annotation (jcf, level);
+}
+
+/* As handle_annotations(), but perform a sanity check that we write
+   the same number of bytes that we were expecting.  */
+
+static void
+handle_annotation_attribute (int ATTRIBUTE_UNUSED index, JCF *jcf, 
+			     long length)
+{
+  long old_datasize = TYPE_REFLECTION_DATASIZE (current_class);
+
+  handle_annotations (jcf, 0);
+
+  gcc_assert (old_datasize + length
+	      == TYPE_REFLECTION_DATASIZE (current_class));
+}
+
+/* gcj permutes its fields array after generating annotation_data, so
+   we have to fixup field indexes for fields that have moved.  Given
+   ARG, a VEC_int, fixup the field indexes in the reflection_data of
+   the outgoing class.  We use field_offsets to tell us where the
+   fixups must go.  */
+
+void
+rewrite_reflection_indexes (void *arg)
+{
+  bitmap_iterator bi;
+  unsigned int offset;
+  VEC(int, heap) *map = arg;
+  unsigned char *data = TYPE_REFLECTION_DATA (current_class);
+
+  if (map)
+    {
+      EXECUTE_IF_SET_IN_BITMAP (field_offsets, 0, offset, bi)
+	{
+	  uint16 index = annotation_read_short (data + offset);
+	  annotation_rewrite_short 
+	    (VEC_index (int, map, index), data + offset);
+	}
+    }
+}
+
+/* Read the RuntimeVisibleAnnotations from JCF and write them to the
+   reflection_data of the outgoing class.  */
+
+static void
+handle_member_annotations (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ANNOTATIONS_KIND);
+  if (member_type == JV_FIELD_ATTR)
+    bitmap_set_bit (field_offsets, TYPE_REFLECTION_DATASIZE (current_class));
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  handle_annotation_attribute (member_index, jcf, len);
+}
+
+/* Read the RuntimeVisibleParameterAnnotations from JCF and write them
+   to the reflection_data of the outgoing class.  */
+
+static void
+handle_parameter_annotations (int member_index, JCF *jcf, 
+			      const unsigned char *name ATTRIBUTE_UNUSED, 
+			      long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint8 num;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_PARAMETER_ANNOTATIONS_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  num = JCF_readu (jcf);
+  annotation_write_byte (num);
+  while (num--)
+    handle_annotations (jcf, 0);
+}
+
+
+/* Read the AnnotationDefault data from JCF and write them to the
+   reflection_data of the outgoing class.  */
+
+static void
+handle_default_annotation (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ANNOTATION_DEFAULT_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  handle_element_value (jcf, 0);
+}
+
+/* As above, for the EnclosingMethod attribute.  */
+
+static void
+handle_enclosingmethod_attribute (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint16 index;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ENCLOSING_METHOD_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_Class);
+  annotation_write_short (index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_NameAndType);
+  annotation_write_short (index);
+}
+
+/* As above, for the Signature attribute.  */
+
+static void
+handle_signature_attribute (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint16 index;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_SIGNATURE_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_Utf8);
+  annotation_write_short (index);
+}
+  
+
+
 #define HANDLE_SOURCEFILE(INDEX) set_source_filename (jcf, INDEX)
 
 #define HANDLE_CLASS_INFO(ACCESS_FLAGS, THIS, SUPER, INTERFACES_COUNT) \
@@ -169,7 +911,7 @@ set_source_filename (JCF *jcf, int index)
 
 #define HANDLE_CONSTANTVALUE(INDEX) \
 { tree constant;  int index = INDEX; \
-  if (! flag_emit_class_files && JPOOL_TAG (jcf, index) == CONSTANT_String) { \
+  if (JPOOL_TAG (jcf, index) == CONSTANT_String) { \
     tree name = get_name_constant (jcf, JPOOL_USHORT1 (jcf, index)); \
     constant = build_utf8_ref (name); \
   } \
@@ -220,16 +962,19 @@ set_source_filename (JCF *jcf, int index)
 /* Link seen inner classes to their outer context and register the
    inner class to its outer context. They will be later loaded.  */
 #define HANDLE_INNERCLASSES_ATTRIBUTE(COUNT) \
-  handle_innerclass_attribute (COUNT, jcf)
+  handle_innerclass_attribute (COUNT, jcf, attribute_length)
 
 #define HANDLE_SYNTHETIC_ATTRIBUTE()					\
 {									\
   /* Irrelevant decls should have been nullified by the END macros.	\
-     We only handle the `Synthetic' attribute on method DECLs.		\
      DECL_ARTIFICIAL on fields is used for something else (See		\
      PUSH_FIELD in java-tree.h) */					\
   if (current_method)							\
     DECL_ARTIFICIAL (current_method) = 1;				\
+  else if (current_field)						\
+    FIELD_SYNTHETIC (current_field) = 1;				\
+  else									\
+    TYPE_SYNTHETIC (current_class) = 1;					\
 }
 
 #define HANDLE_GCJCOMPILED_ATTRIBUTE()		\
@@ -238,17 +983,54 @@ set_source_filename (JCF *jcf, int index)
     jcf->right_zip = 1;				\
 }
 
+#define HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE()			\
+{									\
+  handle_member_annotations (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE()	\
+{							\
+  JCF_SKIP(jcf, attribute_length);			\
+}
+
+#define HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()		\
+{									\
+  handle_parameter_annotations (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()	\
+{								\
+  JCF_SKIP(jcf, attribute_length);				\
+}
+
+#define HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE()				\
+{									\
+  handle_default_annotation (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_ENCLOSINGMETHOD_ATTRIBUTE()				\
+{									\
+  handle_enclosingmethod_attribute (index, jcf, name_data,		\
+				    attribute_length, attr_type);	\
+}
+
+#define HANDLE_SIGNATURE_ATTRIBUTE()				\
+{								\
+  handle_signature_attribute (index, jcf, name_data,		\
+			      attribute_length, attr_type);	\
+}
+
 #include "jcf-reader.c"
 
 tree
 parse_signature (JCF *jcf, int sig_index)
 {
-  if (sig_index <= 0 || sig_index >= JPOOL_SIZE (jcf)
-      || JPOOL_TAG (jcf, sig_index) != CONSTANT_Utf8)
-    abort ();
-  else
-    return parse_signature_string (JPOOL_UTF_DATA (jcf, sig_index),
-				   JPOOL_UTF_LENGTH (jcf, sig_index));
+  gcc_assert (sig_index > 0
+	      && sig_index < JPOOL_SIZE (jcf)
+	      && JPOOL_TAG (jcf, sig_index) == CONSTANT_Utf8);
+
+  return parse_signature_string (JPOOL_UTF_DATA (jcf, sig_index),
+				 JPOOL_UTF_LENGTH (jcf, sig_index));
 }
 
 tree
@@ -266,7 +1048,7 @@ get_constant (JCF *jcf, int index)
     case CONSTANT_Integer:
       {
 	jint num = JPOOL_INT(jcf, index);
-	value = build_int_cst (int_type_node, num, num < 0 ? -1 : 0);
+	value = build_int_cst (int_type_node, num);
 	break;
       }
     case CONSTANT_Long:
@@ -278,8 +1060,7 @@ get_constant (JCF *jcf, int index)
 	lshift_double (num, 0, 32, 64, &lo, &hi, 0);
 	num = JPOOL_UINT (jcf, index+1);
 	add_double (lo, hi, num, 0, &lo, &hi);
-	value = build_int_cst (long_type_node, lo, hi);
-	value = force_fit_type (value, 0, false, false);
+	value = build_int_cst_wide_type (long_type_node, lo, hi);
 	break;
       }
 
@@ -353,10 +1134,7 @@ tree
 get_name_constant (JCF *jcf, int index)
 {
   tree name = get_constant (jcf, index);
-
-  if (TREE_CODE (name) != IDENTIFIER_NODE)
-    abort ();
-
+  gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
   return name;
 }
 
@@ -365,9 +1143,15 @@ get_name_constant (JCF *jcf, int index)
    the outer context with the newly resolved innerclass.  */
 
 static void
-handle_innerclass_attribute (int count, JCF *jcf)
+handle_innerclass_attribute (int count, JCF *jcf, int attribute_length)
 {
-  int c = (count);
+  int c = count;
+
+  annotation_write_byte (JV_CLASS_ATTR);
+  annotation_write_int (attribute_length+1);
+  annotation_write_byte (JV_INNER_CLASSES_KIND);
+  annotation_write_short (count);
+
   while (c--)
     {
       /* Read inner_class_info_index. This may be 0 */
@@ -380,6 +1164,12 @@ handle_innerclass_attribute (int count, JCF *jcf)
       int ini = JCF_readu2 (jcf);
       /* Read the access flag. */
       int acc = JCF_readu2 (jcf);
+
+      annotation_write_short (handle_constant (jcf, icii, CONSTANT_Class));
+      annotation_write_short (handle_constant (jcf, ocii, CONSTANT_Class));
+      annotation_write_short (handle_constant (jcf, ini, CONSTANT_Utf8));
+      annotation_write_short (acc);
+
       /* If icii is 0, don't try to read the class. */
       if (icii >= 0)
 	{
@@ -403,24 +1193,43 @@ handle_innerclass_attribute (int count, JCF *jcf)
 static tree
 give_name_to_class (JCF *jcf, int i)
 {
-  if (i <= 0 || i >= JPOOL_SIZE (jcf)
-      || JPOOL_TAG (jcf, i) != CONSTANT_Class)
-    abort ();
-  else
+  gcc_assert (i > 0
+	      && i < JPOOL_SIZE (jcf)
+	      && JPOOL_TAG (jcf, i) == CONSTANT_Class);
+
     {
+      tree package_name = NULL_TREE, tmp;
       tree this_class;
       int j = JPOOL_USHORT1 (jcf, i);
       /* verify_constant_pool confirmed that j is a CONSTANT_Utf8. */
       tree class_name = unmangle_classname ((const char *) JPOOL_UTF_DATA (jcf, j),
 					    JPOOL_UTF_LENGTH (jcf, j));
       this_class = lookup_class (class_name);
-      input_filename = DECL_SOURCE_FILE (TYPE_NAME (this_class));
-      input_line = 0;
+#ifdef USE_MAPPED_LOCATION
+      {
+      tree source_name = identifier_subst (class_name, "", '.', '/', ".java");
+      const char *sfname = IDENTIFIER_POINTER (source_name);
+      linemap_add (&line_table, LC_ENTER, false, sfname, 0);
+      input_location = linemap_line_start (&line_table, 0, 1);
+      file_start_location = input_location;
+      DECL_SOURCE_LOCATION (TYPE_NAME (this_class)) = input_location;
       if (main_input_filename == NULL && jcf == main_jcf)
-	main_input_filename = input_filename;
+	main_input_filename = sfname;
+      }
+#else
+     if (! DECL_ARTIFICIAL (TYPE_NAME (this_class)))
+      {
+	input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
+	if (main_input_filename == NULL && jcf == main_jcf)
+	  main_input_filename = input_filename;
+      }
+#endif
 
       jcf->cpool.data[i].t = this_class;
       JPOOL_TAG (jcf, i) = CONSTANT_ResolvedClass;
+      split_qualified_name (&package_name, &tmp, 
+      			    DECL_NAME (TYPE_NAME (this_class)));
+      TYPE_PACKAGE (this_class) = package_name;
       return this_class;
     }
 }
@@ -431,9 +1240,9 @@ tree
 get_class_constant (JCF *jcf, int i)
 {
   tree type;
-  if (i <= 0 || i >= JPOOL_SIZE (jcf)
-      || (JPOOL_TAG (jcf, i) & ~CONSTANT_ResolvedFlag) != CONSTANT_Class)
-    abort ();
+  gcc_assert (i > 0
+	      && i < JPOOL_SIZE (jcf)
+	      && (JPOOL_TAG (jcf, i) & ~CONSTANT_ResolvedFlag) == CONSTANT_Class);
 
   if (JPOOL_TAG (jcf, i) != CONSTANT_ResolvedClass)
     {
@@ -482,75 +1291,36 @@ read_class (tree name)
 
   if (jcf == NULL)
     {
+      const char* path_name;
       this_jcf.zipd = NULL;
       jcf = &this_jcf;
-      if (find_class (IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name),
-		      &this_jcf, 1) == 0)
+      
+      path_name = find_class (IDENTIFIER_POINTER (name),
+			      IDENTIFIER_LENGTH (name),
+			      &this_jcf);
+      if (path_name == 0)
 	return 0;
+      else
+	free(CONST_CAST (path_name));
     }
 
   current_jcf = jcf;
 
-  if (current_jcf->java_source)
+  if (class == NULL_TREE || ! CLASS_PARSED_P (class))
     {
-      const char *filename = current_jcf->filename;
-      tree given_file, real_file;
-      FILE *finput;
-      int generate;
-
-      java_parser_context_save_global ();
-      java_push_parser_context ();
-
-      given_file = get_identifier (filename);
-      real_file = get_identifier (lrealpath (filename));
-
-      generate = IS_A_COMMAND_LINE_FILENAME_P (given_file);
-      if (wfl_operator == NULL_TREE)
-	wfl_operator = build_expr_wfl (NULL_TREE, NULL, 0, 0);
-      EXPR_WFL_FILENAME_NODE (wfl_operator) = given_file;
-      input_filename = ggc_strdup (filename);
-      output_class = current_class = NULL_TREE;
-      current_function_decl = NULL_TREE;
-
-      if (! HAS_BEEN_ALREADY_PARSED_P (real_file))
-	{
-	  if (! (finput = fopen (input_filename, "r")))
-	    fatal_error ("can't reopen %s: %m", input_filename);
-
-	  parse_source_file_1 (real_file, finput);
-	  parse_source_file_2 ();
-	  parse_source_file_3 ();
-
-	  if (fclose (finput))
-	    fatal_error ("can't close %s: %m", input_filename);
-	}
-      JCF_FINISH (current_jcf);
-      java_pop_parser_context (generate);
-      java_parser_context_restore_global ();
-    }
-  else
-    {
-      if (class == NULL_TREE || ! CLASS_PARSED_P (class))
-	{
-	  java_parser_context_save_global ();
-	  java_push_parser_context ();
-	  output_class = current_class = class;
-	  input_filename = current_jcf->filename;
-	  if (JCF_SEEN_IN_ZIP (current_jcf))
-	    read_zip_member(current_jcf,
-			    current_jcf->zipd, current_jcf->zipd->zipf);
-	  jcf_parse (current_jcf);
-	  /* Parsing might change the class, in which case we have to
-	     put it back where we found it.  */
-	  if (current_class != class && icv != NULL_TREE)
-	    TREE_TYPE (icv) = current_class;
-	  class = current_class;
-	  java_pop_parser_context (0);
-	  java_parser_context_restore_global ();
-	}
-      layout_class (class);
-      load_inner_classes (class);
+      output_class = current_class = class;
+      if (JCF_SEEN_IN_ZIP (current_jcf))
+	read_zip_member(current_jcf,
+			current_jcf->zipd, current_jcf->zipd->zipf);
+      jcf_parse (current_jcf);
+      /* Parsing might change the class, in which case we have to
+	 put it back where we found it.  */
+      if (current_class != class && icv != NULL_TREE)
+	TREE_TYPE (icv) = current_class;
+      class = current_class;
     }
+  layout_class (class);
+  load_inner_classes (class);
 
   output_class = save_output_class;
   current_class = save_current_class;
@@ -566,7 +1336,14 @@ void
 load_class (tree class_or_name, int verbose)
 {
   tree name, saved;
-  int class_loaded;
+  int class_loaded = 0;
+  tree class_decl = NULL_TREE;
+  bool is_compiled_class = false;
+
+  /* We've already failed, don't try again.  */
+  if (TREE_CODE (class_or_name) == RECORD_TYPE
+      && TYPE_DUMMY (class_or_name))
+    return;
 
   /* class_or_name can be the name of the class we want to load */
   if (TREE_CODE (class_or_name) == IDENTIFIER_NODE)
@@ -577,38 +1354,89 @@ load_class (tree class_or_name, int verbose)
     name = TYPE_NAME (TREE_PURPOSE (class_or_name));
   /* Or it's a type in the making */
   else
+    name = DECL_NAME (TYPE_NAME (class_or_name));
+
+  class_decl = IDENTIFIER_CLASS_VALUE (name);
+  if (class_decl != NULL_TREE)
     {
-      /* If the class is from source code, then it must already be loaded.  */
-      if (CLASS_FROM_SOURCE_P (class_or_name))
-        return;
-      name = DECL_NAME (TYPE_NAME (class_or_name));
+      tree type = TREE_TYPE (class_decl);
+      is_compiled_class
+	= ((TYPE_JCF (type) && JCF_SEEN_IN_ZIP (TYPE_JCF (type)))
+	   || CLASS_FROM_CURRENTLY_COMPILED_P (type));
     }
 
   saved = name;
-  while (1)
+  
+  /* If flag_verify_invocations is unset, we don't try to load a class
+     unless we're looking for Object (which is fixed by the ABI) or
+     it's a class that we're going to compile.  */
+  if (flag_verify_invocations
+      || class_or_name == object_type_node
+      || is_compiled_class
+      || TREE_CODE (class_or_name) == IDENTIFIER_NODE)
     {
-      char *separator;
+      while (1)
+	{
+	  char *separator;
 
-      if ((class_loaded = read_class (name)))
-	break;
+	  /* We've already loaded it.  */
+	  if (IDENTIFIER_CLASS_VALUE (name) != NULL_TREE)
+	    {
+	      tree tmp_decl = IDENTIFIER_CLASS_VALUE (name);
+	      if (CLASS_PARSED_P (TREE_TYPE (tmp_decl)))
+		break;
+	    }
+	
+	  if (read_class (name))
+	    break;
 
-      /* We failed loading name. Now consider that we might be looking
-	 for a inner class. */
-      if ((separator = strrchr (IDENTIFIER_POINTER (name), '$'))
-	  || (separator = strrchr (IDENTIFIER_POINTER (name), '.')))
+	  /* We failed loading name. Now consider that we might be looking
+	     for an inner class.  */
+	  if ((separator = strrchr (IDENTIFIER_POINTER (name), '$'))
+	      || (separator = strrchr (IDENTIFIER_POINTER (name), '.')))
+	    {
+	      int c = *separator;
+	      *separator = '\0';
+	      name = get_identifier (IDENTIFIER_POINTER (name));
+	      *separator = c;
+	    }
+	  /* Otherwise, we failed, we bail. */
+	  else
+	    break;
+	}
+
+      {
+	/* have we found the class we're looking for?  */
+	tree type_decl = IDENTIFIER_CLASS_VALUE (saved);
+	tree type = type_decl ? TREE_TYPE (type_decl) : NULL;
+	class_loaded = type && CLASS_PARSED_P (type);
+      }	      
+    }
+  
+  if (!class_loaded)
+    {
+      if (flag_verify_invocations || ! flag_indirect_dispatch)
 	{
-	  int c = *separator;
-	  *separator = '\0';
-	  name = get_identifier (IDENTIFIER_POINTER (name));
-	  *separator = c;
+	  if (verbose)
+	    error ("cannot find file for class %s", IDENTIFIER_POINTER (saved));
+	}
+      else if (verbose)
+	{
+	  /* This is just a diagnostic during testing, not a real problem.  */
+	  if (!quiet_flag)
+	    warning (0, "cannot find file for class %s", 
+		     IDENTIFIER_POINTER (saved));
+	  
+	  /* Fake it.  */
+	  if (TREE_CODE (class_or_name) == RECORD_TYPE)
+	    {
+	      set_super_info (0, class_or_name, object_type_node, 0);
+	      TYPE_DUMMY (class_or_name) = 1;
+	      /* We won't be able to output any debug info for this class.  */
+	      DECL_IGNORED_P (TYPE_NAME (class_or_name)) = 1;
+	    }
 	}
-      /* Otherwise, we failed, we bail. */
-      else
-	break;
     }
-
-  if (!class_loaded && verbose)
-    error ("cannot find file for class %s", IDENTIFIER_POINTER (saved));
 }
 
 /* Parse the .class file JCF. */
@@ -618,6 +1446,8 @@ jcf_parse (JCF* jcf)
 {
   int i, code;
 
+  bitmap_clear (field_offsets);
+
   if (jcf_parse_preamble (jcf) != 0)
     fatal_error ("not a valid Java .class file");
   code = jcf_parse_constant_pool (jcf);
@@ -663,20 +1493,19 @@ jcf_parse (JCF* jcf)
   if (code != 0)
     fatal_error ("error while parsing final attributes");
 
+  if (TYPE_REFLECTION_DATA (current_class))
+    annotation_write_byte (JV_DONE_ATTR);
+
+#ifdef USE_MAPPED_LOCATION
+  linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
+
   /* The fields of class_type_node are already in correct order. */
   if (current_class != class_type_node && current_class != object_type_node)
     TYPE_FIELDS (current_class) = nreverse (TYPE_FIELDS (current_class));
 
   if (current_class == object_type_node)
-    {
-      layout_class_methods (object_type_node);
-      /* If we don't have the right archive, emit a verbose warning.
-	 If we're generating bytecode, emit the warning only if
-	 -fforce-classes-archive-check was specified. */
-      if (!jcf->right_zip
-	  && (!flag_emit_class_files || flag_force_classes_archive_check))
-	fatal_error ("the `java.lang.Object' that was found in `%s' didn't have the special zero-length `gnu.gcj.gcj-compiled' attribute.  This generally means that your classpath is incorrectly set.  Use `info gcj \"Input Options\"' to see the info page describing how to set the classpath", jcf->filename);
-    }
+    layout_class_methods (object_type_node);
   else
     all_class_list = tree_cons (NULL_TREE,
 				TYPE_NAME (current_class), all_class_list );
@@ -699,6 +1528,56 @@ load_inner_classes (tree cur_class)
 }
 
 static void
+duplicate_class_warning (const char *filename)
+{
+  location_t warn_loc;
+#ifdef USE_MAPPED_LOCATION
+  linemap_add (&line_table, LC_RENAME, 0, filename, 0);
+  warn_loc = linemap_line_start (&line_table, 0, 1);
+#else
+  warn_loc.file = filename;
+  warn_loc.line = 0;
+#endif
+  warning (0, "%Hduplicate class will only be compiled once", &warn_loc);
+}
+
+static void
+java_layout_seen_class_methods (void)
+{
+  tree previous_list = all_class_list;
+  tree end = NULL_TREE;
+  tree current;
+
+  while (1)
+    {
+      for (current = previous_list;
+	   current != end; current = TREE_CHAIN (current))
+        {
+	  tree decl = TREE_VALUE (current);
+          tree cls = TREE_TYPE (decl);
+
+	  input_location = DECL_SOURCE_LOCATION (decl);
+
+          if (! CLASS_LOADED_P (cls))
+            load_class (cls, 0);
+
+          layout_class_methods (cls);
+        }
+
+      /* Note that new classes might have been added while laying out
+         methods, changing the value of all_class_list.  */
+
+      if (previous_list != all_class_list)
+	{
+	  end = previous_list;
+	  previous_list = all_class_list;
+	}
+      else
+	break;
+    }
+}
+
+static void
 parse_class_file (void)
 {
   tree method;
@@ -706,24 +1585,18 @@ parse_class_file (void)
 
   java_layout_seen_class_methods ();
 
-  input_filename = DECL_SOURCE_FILE (TYPE_NAME (current_class));
-  input_line = 0;
+  input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
+  file_start_location = input_location;
   (*debug_hooks->start_source_file) (input_line, input_filename);
 
-  /* Currently we always have to emit calls to _Jv_InitClass when
-     compiling from class files.  */
-  always_initialize_class_p = 1;
-
   gen_indirect_dispatch_tables (current_class);
 
-  java_mark_class_local (current_class);
-
   for (method = TYPE_METHODS (current_class);
        method != NULL_TREE; method = TREE_CHAIN (method))
     {
       JCF *jcf = current_jcf;
 
-      if (METHOD_ABSTRACT (method))
+      if (METHOD_ABSTRACT (method) || METHOD_DUMMY (method))
 	continue;
 
       if (METHOD_NATIVE (method))
@@ -757,10 +1630,11 @@ parse_class_file (void)
 	  continue;
 	}
 
-      input_line = 0;
+      input_location = DECL_SOURCE_LOCATION (TYPE_NAME (current_class));
       if (DECL_LINENUMBERS_OFFSET (method))
 	{
 	  int i;
+	  int min_line = 0;
 	  unsigned char *ptr;
 	  JCF_SEEK (jcf, DECL_LINENUMBERS_OFFSET (method));
 	  linenumber_count = i = JCF_readu2 (jcf);
@@ -771,9 +1645,16 @@ parse_class_file (void)
 	      int line = GET_u2 (ptr);
 	      /* Set initial input_line to smallest linenumber.
 	       * Needs to be set before init_function_start. */
-	      if (input_line == 0 || line < input_line)
-		input_line = line;
-	    }  
+	      if (min_line == 0 || line < min_line)
+		min_line = line;
+	    }
+#ifdef USE_MAPPED_LOCATION
+	  if (min_line != 0)
+	    input_location = linemap_line_start (&line_table, min_line, 1);
+#else
+	  if (min_line != 0)
+	    input_line = min_line;
+#endif
 	}
       else
 	{
@@ -787,75 +1668,33 @@ parse_class_file (void)
 
       give_name_to_locals (jcf);
 
+      /* Bump up start_label_pc_this_method so we get a unique label number
+	 and reset highest_label_pc_this_method. */
+      if (highest_label_pc_this_method >= 0)
+	{
+	  /* We adjust to the next multiple of 1000.  This is just a frill
+	     so the last 3 digits of the label number match the bytecode
+	     offset, which might make debugging marginally more convenient. */
+	  start_label_pc_this_method
+	    = ((((start_label_pc_this_method + highest_label_pc_this_method)
+		 / 1000)
+		+ 1)
+	       * 1000);
+	  highest_label_pc_this_method = -1;
+	}
+
       /* Convert bytecode to trees.  */
       expand_byte_code (jcf, method);
 
       end_java_method ();
     }
 
-  if (flag_emit_class_files)
-    write_classfile (current_class);
-
   finish_class ();
 
-  (*debug_hooks->end_source_file) (save_location.line);
+  (*debug_hooks->end_source_file) (LOCATION_LINE (save_location));
   input_location = save_location;
 }
 
-/* Parse a source file, as pointed by the current value of INPUT_FILENAME. */
-
-static void
-parse_source_file_1 (tree real_file, FILE *finput)
-{
-  int save_error_count = java_error_count;
-
-  /* Mark the file as parsed.  */
-  HAS_BEEN_ALREADY_PARSED_P (real_file) = 1;
-
-  jcf_dependency_add_file (input_filename, 0);
-
-  lang_init_source (1);		    /* Error msgs have no method prototypes */
-
-  /* There's no point in trying to find the current encoding unless we
-     are going to do something intelligent with it -- hence the test
-     for iconv.  */
-#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
-  setlocale (LC_CTYPE, "");
-  if (current_encoding == NULL)
-    current_encoding = nl_langinfo (CODESET);
-#endif 
-  if (current_encoding == NULL || *current_encoding == '\0')
-    current_encoding = DEFAULT_ENCODING;
-
-  /* Initialize the parser */
-  java_init_lex (finput, current_encoding);
-  java_parse_abort_on_error ();
-
-  java_parse ();		    /* Parse and build partial tree nodes. */
-  java_parse_abort_on_error ();
-}
-
-/* Process a parsed source file, resolving names etc. */
-
-static void
-parse_source_file_2 (void)
-{
-  int save_error_count = java_error_count;
-  java_complete_class ();	    /* Parse unsatisfied class decl. */
-  java_parse_abort_on_error ();
-}
-
-static void
-parse_source_file_3 (void)
-{
-  int save_error_count = java_error_count;
-  java_check_circular_reference (); /* Check on circular references */
-  java_parse_abort_on_error ();
-  java_fix_constructors ();	    /* Fix the constructors */
-  java_parse_abort_on_error ();
-  java_reorder_fields ();	    /* Reorder the fields */
-}
-
 void
 add_predefined_file (tree name)
 {
@@ -894,17 +1733,22 @@ void
 java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 {
   int filename_count = 0;
-  char *list, *next;
+  location_t save_location = input_location;
+  char *file_list = NULL, *list, *next;
   tree node;
   FILE *finput = NULL;
+  int in_quotes = 0;
+ 
+  bitmap_obstack_initialize (&bit_obstack);
+  field_offsets = BITMAP_ALLOC (&bit_obstack);
 
   if (flag_filelist_file)
     {
       int avail = 2000;
-      finput = fopen (input_filename, "r");
+      finput = fopen (main_input_filename, "r");
       if (finput == NULL)
 	fatal_error ("can't open %s: %m", input_filename);
-      list = xmalloc(avail);
+      list = XNEWVEC (char, avail);
       next = list;
       for (;;)
 	{
@@ -931,17 +1775,19 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	}
       fclose (finput);
       finput = NULL;
+      file_list = list;
     }
   else
-    list = input_filename ? xstrdup (input_filename) : 0;
+    list = (char *) CONST_CAST (main_input_filename);
 
   while (list)
     {
       for (next = list; ; )
 	{
 	  char ch = *next;
-	  if (ch == '\n' || ch == '\r' || ch == '\t' || ch == ' '
-	      || ch == '&' /* FIXME */)
+	  if (flag_filelist_file && ! in_quotes
+	      && (ch == '\n' || ch == '\r' || ch == '\t' || ch == ' '
+		  || ch == '&') /* FIXME */)
 	    {
 	      if (next == list)
 		{
@@ -955,6 +1801,15 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 		  break;
 		}
 	    }
+	  if (flag_filelist_file && ch == '"')
+	    {
+	      in_quotes = ! in_quotes;
+	      *next++ = '\0';
+	      if (in_quotes) 
+		list = next;
+	      else 
+		break;
+	    }
 	  if (ch == '\0')
 	    {
 	      next = NULL;
@@ -963,60 +1818,37 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	  next++;
 	}
 
-      if (list[0]) 
+      /* Exclude .java files.  */
+      if (strlen (list) > 5 && ! strcmp (list + strlen (list) - 5, ".java"))
 	{
-	  char *value;
-	  tree id;
-	  int twice = 0;
-
-	  int len = strlen (list);
-
-	  obstack_grow0 (&temporary_obstack, list, len);
-	  value = obstack_finish (&temporary_obstack);
+	  /* Nothing. */
+	}
+      else if (list[0]) 
+	{
+	  node = get_identifier (list);
 
 	  filename_count++;
 
-	  /* Exclude file that we see twice on the command line. For
-	     all files except {Class,Error,Object,RuntimeException,String,
-	     Throwable}.java we can rely on maybe_get_identifier. For
-	     these files, we need to do a linear search of
-	     current_file_list. This search happens only for these
-	     files, presumably only when we're recompiling libgcj. */
+	  /* Exclude file that we see twice on the command line. */
 	     
-	  if ((id = maybe_get_identifier (value)))
-	    {
-	      if (predefined_filename_p (id))
-		{
-		  tree c;
-		  for (c = current_file_list; c; c = TREE_CHAIN (c))
-		    if (TREE_VALUE (c) == id)
-		      twice = 1;
-		}
-	      else
-		twice = 1;
-	    }
-
-	  if (twice)
-	    {
-	      location_t warn_loc;
-	      warn_loc.file = value;
-	      warn_loc.line = 0;
-	      warning ("%Hsource file seen twice on command line and "
-		       "will be compiled only once", &warn_loc);
-	    }
+	  if (IS_A_COMMAND_LINE_FILENAME_P (node))
+	    duplicate_class_warning (IDENTIFIER_POINTER (node));
 	  else
 	    {
-	      node = get_identifier (value);
+	      tree file_decl = build_decl (TRANSLATION_UNIT_DECL, node, NULL);
+	      TREE_CHAIN (file_decl) = current_file_list;
+	      current_file_list = file_decl;
 	      IS_A_COMMAND_LINE_FILENAME_P (node) = 1;
-	      current_file_list = tree_cons (NULL_TREE, node, 
-					     current_file_list);
 	    }
 	}
       list = next;
     }
 
+  if (file_list != NULL)
+    free (file_list);
+
   if (filename_count == 0)
-    warning ("no input file specified");
+    warning (0, "no input file specified");
 
   if (resource_name)
     {
@@ -1025,7 +1857,7 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
       /* Only one resource file may be compiled at a time.  */
       assert (TREE_CHAIN (current_file_list) == NULL);
 
-      resource_filename = IDENTIFIER_POINTER (TREE_VALUE (current_file_list));
+      resource_filename = IDENTIFIER_POINTER (DECL_NAME (current_file_list));
       compile_resource_file (resource_name, resource_filename);
 
       goto finish;
@@ -1036,28 +1868,31 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
   for (node = current_file_list; node; node = TREE_CHAIN (node))
     {
       unsigned char magic_string[4];
+      char *real_path;
       uint32 magic = 0;
-      tree name = TREE_VALUE (node);
+      tree name = DECL_NAME (node);
       tree real_file;
+      const char *filename = IDENTIFIER_POINTER (name);
 
       /* Skip already parsed files */
-      real_file = get_identifier (lrealpath (IDENTIFIER_POINTER (name)));
+      real_path = lrealpath (filename);
+      real_file = get_identifier (real_path);
+      free (real_path);
       if (HAS_BEEN_ALREADY_PARSED_P (real_file))
 	continue;
-      
+
       /* Close previous descriptor, if any */
       if (finput && fclose (finput))
 	fatal_error ("can't close input file %s: %m", main_input_filename);
       
-      finput = fopen (IDENTIFIER_POINTER (name), "rb");
+      finput = fopen (filename, "rb");
       if (finput == NULL)
-	fatal_error ("can't open %s: %m", IDENTIFIER_POINTER (name));
+	fatal_error ("can't open %s: %m", filename);
 
 #ifdef IO_BUFFER_SIZE
       setvbuf (finput, xmalloc (IO_BUFFER_SIZE),
 	       _IOFBF, IO_BUFFER_SIZE);
 #endif
-      input_filename = IDENTIFIER_POINTER (name);
 
       /* Figure what kind of file we're dealing with */
       if (fread (magic_string, 1, 4, finput) == 4)
@@ -1073,58 +1908,72 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	  current_jcf->read_state = finput;
 	  current_jcf->filbuf = jcf_filbuf_from_stdio;
 	  jcf_parse (current_jcf);
+	  DECL_SOURCE_LOCATION (node) = file_start_location;
 	  TYPE_JCF (current_class) = current_jcf;
+	  if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
+	    {
+	      /* We've already compiled this class.  */
+	      duplicate_class_warning (filename);
+	      continue;
+	    }
 	  CLASS_FROM_CURRENTLY_COMPILED_P (current_class) = 1;
-	  TREE_PURPOSE (node) = current_class;
+	  TREE_TYPE (node) = current_class;
 	}
       else if (magic == (JCF_u4)ZIPMAGIC)
 	{
-	  ZIP_FILE_P (node) = 1;
 	  main_jcf = ggc_alloc (sizeof (JCF));
 	  JCF_ZERO (main_jcf);
 	  main_jcf->read_state = finput;
 	  main_jcf->filbuf = jcf_filbuf_from_stdio;
-	  if (open_in_zip (main_jcf, input_filename, NULL, 0) <  0)
-	    fatal_error ("bad zip/jar file %s", IDENTIFIER_POINTER (name));
+#ifdef USE_MAPPED_LOCATION
+	  linemap_add (&line_table, LC_ENTER, false, filename, 0);
+	  input_location = linemap_line_start (&line_table, 0, 1);
+#endif
+	  if (open_in_zip (main_jcf, filename, NULL, 0) <  0)
+	    fatal_error ("bad zip/jar file %s", filename);
 	  localToFile = SeenZipFiles;
 	  /* Register all the classes defined there.  */
 	  process_zip_dir (main_jcf->read_state);
+#ifdef USE_MAPPED_LOCATION
+	  linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
 	  parse_zip_file_entries ();
-	  /*
-	  for (each entry)
-	    CLASS_FROM_CURRENTLY_COMPILED_P (current_class) = 1;
-	  */
 	}
       else
 	{
-	  JAVA_FILE_P (node) = 1;
+	  gcc_unreachable ();
+#if 0
 	  java_push_parser_context ();
 	  java_parser_context_save_global ();
 
-	  parse_source_file_1 (real_file, finput);
+	  parse_source_file_1 (real_file, filename, finput);
 	  java_parser_context_restore_global ();
 	  java_pop_parser_context (1);
+#ifdef USE_MAPPED_LOCATION
+	  linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
+#endif
+#endif
 	}
     }
 
-  for (ctxp = ctxp_for_generation;  ctxp;  ctxp = ctxp->next)
-    {
-      input_filename = ctxp->filename;
-      parse_source_file_2 ();
-    }
-
-  for (ctxp = ctxp_for_generation; ctxp; ctxp = ctxp->next)
+  /* Do this before lowering any code.  */
+  for (node = current_file_list; node; node = TREE_CHAIN (node))
     {
-      input_filename = ctxp->filename;
-      parse_source_file_3 ();
+      if (CLASS_FILE_P (node))
+	java_mark_class_local (TREE_TYPE (node));
     }
 
   for (node = current_file_list; node; node = TREE_CHAIN (node))
     {
-      input_filename = IDENTIFIER_POINTER (TREE_VALUE (node));
+      input_location = DECL_SOURCE_LOCATION (node);
       if (CLASS_FILE_P (node))
 	{
-	  output_class = current_class = TREE_PURPOSE (node);
+	  /* FIXME: These two flags really should be independent.  We
+	     should be able to compile fully binary compatible, but
+	     with flag_verify_invocations on.  */
+	  flag_verify_invocations = ! flag_indirect_dispatch;
+	  output_class = current_class = TREE_TYPE (node);
+
 	  current_jcf = TYPE_JCF (current_class);
 	  layout_class (current_class);
 	  load_inner_classes (current_class);
@@ -1132,14 +1981,9 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	  JCF_FINISH (current_jcf);
 	}
     }
-  input_filename = main_input_filename;
+  input_location = save_location;
 
-  java_expand_classes ();
-  if (java_report_errors () || flag_syntax_only)
-    return;
-    
-  /* Expand all classes compiled from source.  */
-  java_finish_classes ();
+  bitmap_obstack_release (&bit_obstack);
 
  finish:
   /* Arrange for any necessary initialization to happen.  */
@@ -1159,13 +2003,24 @@ compute_class_name (struct ZipDirectory *zdir)
 {
   char *class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
   char *class_name;
-  int j;
+  int i;
+  int filename_length = zdir->filename_length;
+
+  while (filename_length > 2 && strncmp (class_name_in_zip_dir, "./", 2) == 0)
+    {
+      class_name_in_zip_dir += 2;
+      filename_length -= 2;
+    }
+
+  filename_length -= strlen (".class");
+  class_name = XNEWVEC (char, filename_length + 1);
+  memcpy (class_name, class_name_in_zip_dir, filename_length);
+  class_name [filename_length] = '\0';
+
+  for (i = 0; i < filename_length; i++)
+    if (class_name[i] == '/')
+      class_name[i] = '.';
 
-  class_name = ALLOC (zdir->filename_length + 1 - 6);
-  strncpy (class_name, class_name_in_zip_dir, zdir->filename_length - 6);
-  class_name [zdir->filename_length - 6] = '\0';
-  for (j = 0; class_name[j]; ++j)
-    class_name[j] = class_name[j] == '/' ? '.' : class_name[j];
   return class_name;
 }
 
@@ -1219,6 +2074,23 @@ parse_zip_file_entries (void)
 	    current_jcf = TYPE_JCF (class);
 	    output_class = current_class = class;
 
+	    /* This is a dummy class, and now we're compiling it for
+	       real.  */
+	    gcc_assert (! TYPE_DUMMY (class));
+
+	    /* This is for a corner case where we have a superclass
+	       but no superclass fields.  
+
+	       This can happen if we earlier failed to lay out this
+	       class because its superclass was still in the process
+	       of being laid out; this occurs when we have recursive
+	       class dependencies via inner classes.  Setting
+	       TYPE_SIZE to null here causes CLASS_LOADED_P to return
+	       false, so layout_class() will be called again.  */
+	    if (TYPE_SIZE (class) && CLASSTYPE_SUPER (class)
+		&& integer_zerop (TYPE_SIZE (class)))
+	      TYPE_SIZE (class) = NULL_TREE;
+
 	    if (! CLASS_LOADED_P (class))
 	      {
 		if (! CLASS_PARSED_P (class))
@@ -1232,9 +2104,8 @@ parse_zip_file_entries (void)
 
 	    if (TYPE_SIZE (current_class) != error_mark_node)
 	      {
-		input_filename = current_jcf->filename;
 		parse_class_file ();
-		FREE (current_jcf->buffer); /* No longer necessary */
+		free (current_jcf->buffer); /* No longer necessary */
 		/* Note: there is a way to free this buffer right after a
 		   class seen in a zip file has been parsed. The idea is the
 		   set its jcf in such a way that buffer will be reallocated
@@ -1247,15 +2118,14 @@ parse_zip_file_entries (void)
 	  {
 	    char *file_name, *class_name_in_zip_dir, *buffer;
 	    JCF *jcf;
-	    file_name = ALLOC (zdir->filename_length + 1);
+	    file_name = XNEWVEC (char, zdir->filename_length + 1);
 	    class_name_in_zip_dir = ZIPDIR_FILENAME (zdir);
 	    strncpy (file_name, class_name_in_zip_dir, zdir->filename_length);
 	    file_name[zdir->filename_length] = '\0';
-	    jcf = ALLOC (sizeof (JCF));
+	    jcf = XNEW (JCF);
 	    JCF_ZERO (jcf);
 	    jcf->read_state  = finput;
 	    jcf->filbuf      = jcf_filbuf_from_stdio;
-	    jcf->java_source = 0;
 	    jcf->classname   = NULL;
 	    jcf->filename    = file_name;
 	    jcf->zipd        = zdir;
@@ -1263,7 +2133,7 @@ parse_zip_file_entries (void)
 	    if (read_zip_member (jcf, zdir, localToFile) < 0)
 	      fatal_error ("error while reading %s from zip file", file_name);
 
-	    buffer = ALLOC (zdir->filename_length + 1 +
+	    buffer = XNEWVEC (char, zdir->filename_length + 1 +
 			    (jcf->buffer_end - jcf->buffer));
 	    strcpy (buffer, file_name);
 	    /* This is not a typo: we overwrite the trailing \0 of the
@@ -1274,13 +2144,13 @@ parse_zip_file_entries (void)
 	    compile_resource_data (file_name, buffer,
 				   jcf->buffer_end - jcf->buffer);
 	    JCF_FINISH (jcf);
-	    FREE (jcf);
-	    FREE (buffer);
+	    free (jcf);
+	    free (buffer);
 	  }
 	  break;
 
 	default:
-	  abort ();
+	  gcc_unreachable ();
 	}
     }
 }
@@ -1308,7 +2178,7 @@ process_zip_dir (FILE *finput)
 	continue;
 
       class_name = compute_class_name (zdir);
-      file_name  = ALLOC (zdir->filename_length+1);
+      file_name  = XNEWVEC (char, zdir->filename_length+1);
       jcf = ggc_alloc (sizeof (JCF));
       JCF_ZERO (jcf);
 
@@ -1317,9 +2187,18 @@ process_zip_dir (FILE *finput)
 
       class = lookup_class (get_identifier (class_name));
 
+      if (CLASS_FROM_CURRENTLY_COMPILED_P (class))
+	{
+	  /* We've already compiled this class.  */
+	  duplicate_class_warning (file_name);
+	  continue;
+	}
+      /* This function is only called when processing a zip file seen
+	 on the command line.  */
+      CLASS_FROM_CURRENTLY_COMPILED_P (class) = 1;
+
       jcf->read_state  = finput;
       jcf->filbuf      = jcf_filbuf_from_stdio;
-      jcf->java_source = 0;
       jcf->classname   = class_name;
       jcf->filename    = file_name;
       jcf->zipd        = zdir;
@@ -1328,12 +2207,5 @@ process_zip_dir (FILE *finput)
     }
 }
 
-/* Initialization.  */
-
-void
-init_jcf_parse (void)
-{
-  init_src_parse ();
-}
-
 #include "gt-java-jcf-parse.h"
+#include "gtype-java.h"