function.c: Include hash.h.

	* function.c: Include hash.h.
	(insns_for_mem_entry): New struct.
	(put_reg_into_stack): Take an optional hash-table mapping MEMs to
	the INSNs that use them.
	(fixup_var_refs): Likewise.
	(put_addressof_into_stack): Likewise.
	(purge_addressof_1): Likewise.  Keep the hash-table up to date if
	we add new instructions.
	(fixup_var_refs_insns): Use it to avoid searching the entire
	instruction chain.
	(insns_for_mem_newfunc): New function.
	(insns_for_mem_comp): Likewise.
	(insns_for_mem_walk): Likewise.
	(compute_insns_for_mem): Likewise.
	(pop_function_context_from): Pass NULL for the hash-table.
	(put_var_into_stack): Likewise.
	(gen_mem_addressof): Likewise.
	(flush_addressof): Likewise.
	(purge_addressof): Call compute_insns_for_mem to pre-compute the
	hash table.
	* Makefile.in (OBJS): Include hash.o.
	(function.o): Depend on hash.h.
	* Makefile.in (OBJS): Don't mention hash.o.
	(OBJDEPS): Likewise.

From-SVN: r25922

gcc/ChangeLog

+Tue Mar 23 07:50:20 1999  Mark Mitchell  <mark@codesourcery.com>
+
+	* function.c: Include hash.h.
+	(insns_for_mem_entry): New struct.
+	(put_reg_into_stack): Take an optional hash-table mapping MEMs to
+	the INSNs that use them.
+	(fixup_var_refs): Likewise.
+	(put_addressof_into_stack): Likewise.
+	(purge_addressof_1): Likewise.  Keep the hash-table up to date if
+	we add new instructions.
+	(fixup_var_refs_insns): Use it to avoid searching the entire
+	instruction chain.
+	(insns_for_mem_newfunc): New function.
+	(insns_for_mem_comp): Likewise.
+	(insns_for_mem_walk): Likewise.
+	(compute_insns_for_mem): Likewise.
+	(pop_function_context_from): Pass NULL for the hash-table.
+	(put_var_into_stack): Likewise.
+	(gen_mem_addressof): Likewise.
+	(flush_addressof): Likewise.
+	(purge_addressof): Call compute_insns_for_mem to pre-compute the
+	hash table.
+	* Makefile.in (OBJS): Include hash.o.
+	(function.o): Depend on hash.h.
+	
 Tue Mar 23 00:39:14 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* crtstuff.c: Use ANSI function definitions.  Fix minor whitespace

gcc/Makefile.in

@@ -679,7 +679,7 @@ OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
  insn-peep.o reorg.o $(SCHED_PREFIX)sched.o final.o recog.o reg-stack.o \
  insn-opinit.o insn-recog.o insn-extract.o insn-output.o insn-emit.o lcm.o \
  profile.o insn-attrtab.o $(out_object_file) getpwd.o $(EXTRA_OBJS) convert.o \
- mbchar.o dyn-string.o splay-tree.o graph.o sbitmap.o resource.o
+ mbchar.o dyn-string.o splay-tree.o graph.o sbitmap.o resource.o hash.o
 
 # GEN files are listed separately, so they can be built before doing parallel
 #  makes for cc1 or cc1plus.  Otherwise sequent parallel make attempts to load
@@ -1452,7 +1452,7 @@ varasm.o : varasm.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h \
    xcoffout.h output.h c-pragma.h toplev.h except.h dbxout.h sdbout.h
 function.o : function.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \
    function.h insn-flags.h insn-codes.h $(EXPR_H) $(REGS_H) hard-reg-set.h \
-   insn-config.h $(RECOG_H) output.h toplev.h except.h
+   insn-config.h $(RECOG_H) output.h toplev.h except.h hash.h
 stmt.o : stmt.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h  \
    insn-flags.h insn-config.h insn-codes.h hard-reg-set.h $(EXPR_H) except.h \
    loop.h $(RECOG_H) toplev.h output.h varray.h

gcc/cp/ChangeLog

+1999-03-23  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (OBJS): Don't mention hash.o.
+	(OBJDEPS): Likewise.
+
 1999-03-23  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* decl2.c (finish_file): Set at_eof to 2 after expanding ctors.
@@ -60,6 +65,7 @@
 	* decl.c (start_function): Suppress normal linkage heuristics
 	for #pragma interface under MULTIPLE_SYMBOL_SPACES.
 
+>>>>>>> 1.947
 1999-03-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* Make-lang.in: ($(INTL_TARGETS)): depend on cp/parse.c

gcc/cp/Makefile.in

@@ -191,8 +191,8 @@ CXX_OBJS = call.o decl.o errfn.o expr.o pt.o sig.o typeck2.o \
  repo.o @extra_cxx_objs@
 
 # Language-independent object files.
-OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o ../hash.o
-OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o ../hash.o
+OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o
+OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o
 
 compiler: ../cc1plus$(exeext)
 ../cc1plus$(exeext): $(P) $(OBJDEPS) $(CXX_OBJS) $(LIBDEPS)