From 2fc7533375b159224edbac63586e1d2dbf97c17c Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Thu, 27 Jul 2000 09:19:37 +0000
Subject: [PATCH]   * removed obsolete typeconversion (it got removed by the
 compiler in     firsttypeconv anyway) (merged from fixes branch)

---
 compiler/tcadd.pas | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/compiler/tcadd.pas b/compiler/tcadd.pas
index b78c2417d0..9178577c85 100644
--- a/compiler/tcadd.pas
+++ b/compiler/tcadd.pas
@@ -449,8 +449,14 @@ implementation
                 else
                   CGMessage(type_e_mismatch);
                 end;
-
+(*
                 { these one can't be in flags! }
+                
+                Yes they can, secondadd converts the loc_flags to a register.
+                The typeconversions below are simply removed by firsttypeconv()
+                because the resulttype of p^.left = p^.left^.resulttype
+                (surprise! :) (JM)
+                
                 if p^.treetype in [xorn,unequaln,equaln] then
                   begin
                      if p^.left^.location.loc=LOC_FLAGS then
@@ -470,6 +476,7 @@ implementation
                      { readjust registers }
                      calcregisters(p,1,0,0);
                   end;
+*)
                 convdone:=true;
               end
              else
@@ -1278,7 +1285,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  2000-07-14 05:11:49  michael
+  Revision 1.4  2000-07-27 09:19:37  jonas
+    * removed obsolete typeconversion (it got removed by the compiler in
+      firsttypeconv anyway) (merged from fixes branch)
+
+  Revision 1.3  2000/07/14 05:11:49  michael
   + Patch to 1.1
 
   Revision 1.2  2000/07/13 11:32:50  michael