trunk/gcc136/vcs_diff_compiler.patch results

File details

./trunk/gcc136/vcs_diff_compiler.patch 2026-09-14-03:34

Used binaries

Binaries version

> uname -a
Linux cfarm136 7.1.8+deb14.1-amd64 #1 SMP PREEMPT_DYNAMIC Debian 7.1.8-2 (2026-08-15) x86_64 GNU/Linux

Full file content

 
diff --cc compiler/optcall.pas
index dff848f315,9668b31075..0000000000
--- a/compiler/optcall.pas
+++ b/compiler/optcall.pas
@@@ -222,7 -222,7 +222,11 @@@ unit optcall
  
          { the inlined block takes the place of the call node, so it has to
            inherit its currency scaling state: without it, the enclosing
++<<<<<<< HEAD
 +          taddnode sees an operand that is no longer marked as scaled and
++=======
+           taddnode sees an operand that is no longer marked as currency and
++>>>>>>> 5125816395 (Test fix proposed by Sven Harazim in bug report 41865)
            taddnode.do_currency_corrections applies the 10000 scalar a second
            time }
          if (cnf_return_value_used in callnode.callnodeflags) and
* Unmerged path compiler/optcall.pas