tree.def (EXPR_WITH_FILE_LOCATION): Fix comment formatting.

	* tree.def (EXPR_WITH_FILE_LOCATION): Fix comment formatting.
	* tree.h (EXPR_WFL_FILENAME): Define in terms of
	EXPR_WFL_FILENAME_NODE.
	(EXPR_WFL_FILENAME_NODE): Use the second operand slot rather than
	the TREE_CHAIN.
	* print-tree.c (print_note): Print TREE_PRIVATE and
	TREE_PROTECTED.

From-SVN: r30783

gcc/ChangeLog

 1999-12-04  Mark Mitchell  <mark@codesourcery.com>
 
+	* tree.def (EXPR_WITH_FILE_LOCATION): Fix comment formatting.
+	* tree.h (EXPR_WFL_FILENAME): Define in terms of
+	EXPR_WFL_FILENAME_NODE.
+	(EXPR_WFL_FILENAME_NODE): Use the second operand slot rather than
+	the TREE_CHAIN.
+	* print-tree.c (print_note): Print TREE_PRIVATE and
+	TREE_PROTECTED.
+	
+	* dwarf2out.c (add_abstract_origin_attribute): Don't abort when
+	the original die cannot be found.
+
+	* varray.h (varray_head_tag): Add elements_used.
+	(VARRAY_PUSH): New macro.
+	(VARRAY_POP): Likewise.
+	(VARRAY_TOP): Likewise.
+	Add variants of VARRAY_PUSH and VARRAY_POP for all varray element
+	types. 
+	* varray.c (varray_init): Initialize elements_used.
+	* Makefile.in (BASIC_BLOCK_H): Add varray.h.
+	(INTEGRATE_H): New variable.
+	(integrate.o): Depend on INTEGRATE_H.
+	(unroll.o): Likewise.
+	
 	* function.h (insert_block_after_note): Declare.
 	* function.c (insert_block_after_note): Split out from ...
 	(retrofit_block): ... here.

gcc/print-tree.c

@@ -304,6 +304,10 @@ print_node (file, prefix, node, indent)
     fputs (" permanent", file);
   if (TREE_PUBLIC (node))
     fputs (" public", file);
+  if (TREE_PRIVATE (node))
+    fputs (" private", file);
+  if (TREE_PROTECTED (node))
+    fputs (" protected", file);
   if (TREE_STATIC (node))
     fputs (" static", file);
   if (TREE_LANG_FLAG_0 (node))

gcc/tree.def

@@ -794,7 +794,7 @@ DEFTREECODE (EXIT_BLOCK_EXPR, "exit_block_expr", 'e', 2)
    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. */
+   be emitted first if EXPR_WFL_EMIT_LINE_NOTE.  */
 DEFTREECODE (EXPR_WITH_FILE_LOCATION, "expr_with_file_location", 'e', 2)
 
 /* Switch expression.

gcc/tree.h

@@ -750,8 +750,9 @@ struct tree_vec
 
 /* In a EXPR_WITH_FILE_LOCATION node.  */
 #define EXPR_WFL_NODE(NODE) TREE_OPERAND((NODE), 0)
-#define EXPR_WFL_FILENAME(NODE) (IDENTIFIER_POINTER ((NODE)->common.chain))
-#define EXPR_WFL_FILENAME_NODE(NODE) ((NODE)->common.chain)
+#define EXPR_WFL_FILENAME(NODE) \
+  (IDENTIFIER_POINTER (EXPR_WFL_FILENAME_NODE ((NODE))))
+#define EXPR_WFL_FILENAME_NODE(NODE) TREE_OPERAND((NODE), 1)
 #define EXPR_WFL_LINENO(NODE) (EXPR_CHECK (NODE)->exp.complexity >> 12)
 #define EXPR_WFL_COLNO(NODE) (EXPR_CHECK (NODE)->exp.complexity & 0xfff)
 #define EXPR_WFL_LINECOL(NODE) (EXPR_CHECK (NODE)->exp.complexity)