Merge tree-ssa-20020619-branch into mainline.

git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@81764 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 0 insertions, 15 deletions

diff --git a/gcc/integrate.h b/gcc/integrate.h
index 94bf2e738d4..88a4f5ddeb7 100644
--- a/gcc/integrate.h
+++ b/gcc/integrate.h
@@ -35,23 +35,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 struct inline_remap
 {
-  /* True if we are doing function integration, false otherwise.
-     Used to control whether RTX_UNCHANGING bits are copied by
-     copy_rtx_and_substitute.  */
-  int integrating;
   /* Definition of function be inlined.  */
   tree fndecl;
   /* Place to put insns needed at start of function.  */
   rtx insns_at_start;
-  /* Mapping from old BLOCKs to new BLOCKs.  */
-  varray_type block_map;
   /* Mapping from old registers to new registers.
      It is allocated and deallocated in `expand_inline_function' */
   rtx *reg_map;
-#if defined (LEAF_REGISTERS) && defined (LEAF_REG_REMAP)
-  /* Mapping from old leaf registers to new leaf registers.  */
-  rtx leaf_reg_map[FIRST_PSEUDO_REGISTER][NUM_MACHINE_MODES];
-#endif
   /* Mapping from old code-labels to new code-labels.
      The first element of this map is label_map[min_labelno].  */
   rtx *label_map;
@@ -85,8 +75,6 @@ struct inline_remap
 #define CONST_AGE_PARM (-1)
   unsigned int const_age;
 
-  /* Target of the inline function being expanded, or NULL if none.  */
-  rtx inline_target;
   /* When an insn is being copied by copy_rtx_and_substitute,
      this is nonzero if we have copied an ASM_OPERANDS.
      In that case, it is the original input-operand vector.  */
@@ -98,9 +86,6 @@ struct inline_remap
   /* Likewise, this is the copied constraints vector.  */
   rtvec copy_asm_constraints_vector;
 
-  /* Target of a return insn, if needed and inlining.  */
-  rtx local_return_label;
-
   /* Indications for regs being pointers and their alignment.  */
   unsigned char *regno_pointer_align;
   rtx *x_regno_reg_rtx;