From 779e5fb7e9a73d1c2a82d3f23d55b7b394286e59 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Tue, 5 Dec 2000 15:19:50 +0000
Subject: [PATCH]   * fixed webbug 1268 ("merged")

---
 compiler/nmem.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/compiler/nmem.pas b/compiler/nmem.pas
index 654908aa72..b2926a4f05 100644
--- a/compiler/nmem.pas
+++ b/compiler/nmem.pas
@@ -331,8 +331,10 @@ implementation
                            { remove calln node }
                            tcallnode(left).right:=nil;
                            left.free;
-                           left:=hp;
+                           { first do firstpass, then assignment in case hp }
+                           { gets changed by firstpass (JM)                 }
                            firstpass(hp);
+                           left:=hp;
                            include(flags,nf_procvarload);
                          end;
                      end;
@@ -343,6 +345,8 @@ implementation
                    derefn :
                      begin
                        firstpass(hp);
+                       { in case hp gets changed by firstpass (JM) }
+                       left := hp;
                        if codegenerror then
                         exit;
                        if hp.resulttype^.deftype=procvardef then
@@ -869,7 +873,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.11  2000-11-29 00:30:34  florian
+  Revision 1.12  2000-12-05 15:19:50  jonas
+    * fixed webbug 1268 ("merged")
+
+  Revision 1.11  2000/11/29 00:30:34  florian
     * unused units removed from uses clause
     * some changes for widestrings