-- Zusammenführen von r48108 bis r48520 in ».«:

A    tests/webtbs/uw38385b.pp
A    tests/webtbs/tw38351.pp
A    tests/webtbs/tw38316.pp
U    tests/Makefile
A    tests/webtbf/tw37217.pp
A    tests/webtbs/tw32139.pp
A    tests/webtbs/tw38429.pp
A    tests/webtbs/tw38413.pp
A    tests/webtbs/uw38385a.pp
A    tests/webtbs/tw38390.pp
A    tests/webtbs/tw38306.pp
A    tests/webtbs/tw38337.pp
C    tests/bench/bcase.pp
U    rtl/unix/sysutils.pp
U    rtl/unix/oscdeclh.inc
U    rtl/linux/x86_64/syscall.inc
U    rtl/linux/x86_64/si_prc.inc
U    rtl/linux/linux.pp
U    rtl/linux/m68k/cprt0.as
U    rtl/linux/m68k/dllprt0.as
U    rtl/linux/mips/cprt0.as
U    rtl/linux/mips/prt0.as
U    rtl/linux/i386/si_prc.inc
U    rtl/linux/si_impl.inc
U    rtl/linux/system.pp
U    rtl/i386/cpu.pp
U    rtl/objpas/sysconst.pp
U    rtl/objpas/sysutils/syshelpo.inc
U    rtl/amiga/powerpc/execf.inc
U    tests/test/units/sysutils/tfile1.pp
A    tests/test/units/sysutils/tfileage.pp
A    tests/test/units/linux/tfutimesen.pp
U    tests/test/units/linux/tstatx.pp
A    tests/test/units/linux/tutimensat.pp
A    tests/test/cg/tpara4.pp
U    tests/test/theapthread.pp
A    tests/webtbf/tw24434.pp
A    tests/webtbf/tw38287.pp
A    tests/webtbs/tw34027.pp
A    tests/webtbs/uw38429.pp
A    tests/webtbs/tw38412.pp
A    tests/webtbs/tw38385.pp
A    tests/webtbs/uw38385c.pp
U    tests/webtbs/tw37060.pp
A    tests/webtbs/tw38339.pp
U    tests/Makefile.fpc
U    tests/utils/testsuite/utests.pp
U    compiler/utils/mkx86inl.pp
U    compiler/utils/ppuutils/ppudump.pp
U    compiler/nmem.pas
U    compiler/msg/errorda.msg
U    compiler/msg/errorf.msg
U    compiler/msg/errorid.msg
U    compiler/msg/errorpli.msg
U    compiler/msg/errorru.msg
U    compiler/m68k/aoptcpu.pas
U    compiler/systems/t_darwin.pas
U    compiler/utils/msg2inc.pp
U    compiler/utils/Makefile.fpc
U    compiler/cfidwarf.pas
U    compiler/msg/errord.msg
U    compiler/msg/errores.msg
U    compiler/msg/errorheu.msg
U    compiler/msg/errorpl.msg
U    compiler/msg/errorr.msg
U    compiler/m68k/cgcpu.pas
U    compiler/rgobj.pas
U    compiler/Makefile.fpc
U    compiler/utils/Makefile
U    compiler/ngtcon.pas
U    compiler/msg/errorct.msg
U    compiler/msg/errore.msg
U    compiler/msg/errorhe.msg
U    compiler/msg/errorn.msg
U    compiler/msg/errorptu.msg
C    compiler/msgtxt.inc
C    compiler/msgidx.inc
U    compiler/systems/t_freertos.pas
U    compiler/Makefile
U    compiler/utils/mkz80ins.pp
U    compiler/aasmcnst.pas
U    compiler/ncon.pas
U    compiler/msg/errordu.msg
U    compiler/msg/errorfi.msg
U    compiler/msg/erroriu.msg
U    compiler/msg/errorpt.msg
U    compiler/msg/errorues.msg
U    compiler/ncgvmt.pas
U    compiler/systems/t_embed.pas
U    compiler/systems/t_bsd.pas
U    compiler/dbgcodeview.pas
U    compiler/x86/agx86nsm.pas
U    compiler/systems/t_win16.pas
U    compiler/verbose.pas
U    compiler/x86/aasmcpu.pas
U    compiler/x86/nx86mat.pas
U    compiler/systems/t_amiga.pas
U    compiler/x86/cgx86.pas
U    compiler/x86/nx86inl.pas
U    compiler/systems/t_win.pas
U    compiler/x86/cx86mminnr.inc
U    compiler/x86/aoptx86.pas
U    compiler/x86/nx86set.pas
U    compiler/systems.pas
U    compiler/avr/navradd.pas
U    compiler/avr/raavrgas.pas
U    compiler/aarch64/aasmcpu.pas
U    compiler/jvm/hlcgcpu.pas
U    compiler/jvm/njvmmat.pas
U    compiler/psabiehpi.pas
U    compiler/options.pas
U    compiler/avr/cpupara.pas
U    compiler/avr/navrmat.pas
U    compiler/aarch64/aoptcpu.pas
U    compiler/jvm/njvmmem.pas
U    compiler/jvm/njvminl.pas
U    compiler/pgenutil.pas
U    compiler/globtype.pas
U    compiler/avr/cgcpu.pas
U    compiler/avr/aoptcpu.pas
U    compiler/aarch64/agcpugas.pas
U    compiler/jvm/dbgjasm.pas
U    compiler/jvm/cpubase.pas
U    compiler/ogomf.pas
U    compiler/i8086/symcpu.pas
U    compiler/x86/rax86.pas
U    compiler/arm/aoptcpu.pas
U    compiler/avr/agavrgas.pas
U    compiler/avr/rgcpu.pas
U    compiler/aarch64/cgcpu.pas
U    compiler/jvm/agjasmin.pas
U    compiler/nflw.pas
U    compiler/i8086/n8086mem.pas
 U   packages/graph/src/inc/graph.tex
A    packages/fcl-net/tests
U    compiler/i8086/n8086tcon.pas
U    compiler/ncginl.pas
U    compiler/symdef.pas
U    compiler/i8086/cpupara.pas
U    compiler/nbas.pas
U    compiler/scandir.pas
U    compiler/hlcgobj.pas
U    compiler/nadd.pas
U    compiler/psub.pas
U    compiler/armgen/aoptarm.pas
U    compiler/aggas.pas
U    compiler/optloop.pas
U    compiler/scanner.pas
U    compiler/x86_64/nx64mat.pas
U    compiler/ogbase.pas
U    compiler/i386/aoptcpu.pas
U    packages/fcl-passrc/src/pasresolver.pp
U    packages/pastojs/src/fppas2js.pp
U    packages/rtl-objpas/src/inc/dateutil.inc
A    packages/fcl-net/tests/netdbtest.pp
U    compiler/x86_64/aoptcpu.pas
U    compiler/ncal.pas
U    compiler/fpcdefs.inc
U    packages/pastojs/tests/tcmodules.pas
U    packages/rtl-objpas/src/inc/variants.pp
U    packages/fcl-net/src/netdb.pp
A    packages/pasjpeg/examples/demo.lpi
U    compiler/x86_64/cpupara.pas
U    compiler/dbgstabs.pas
U    compiler/aoptobj.pas
U    packages/fcl-passrc/tests/tcresolver.pas
U    packages/pastojs/src/pas2jspcucompiler.pp
U    packages/fcl-base/src/bufstream.pp
U    packages/fcl-stl/src/gdeque.pp
U    compiler/x86_64/cpuelf.pas
U    compiler/ncnv.pas
U    compiler/pdecsub.pas
U    packages/fcl-passrc/src/pparser.pp
U    packages/pastojs/src/pas2jsfiler.pp
U    packages/fcl-base/src/eventlog.pp
A    packages/fcl-net/tests/tresolvertests.pp
U    packages/pasjpeg/examples/example.pas
U    packages/fcl-registry/tests/Makefile
U    packages/fcl-registry/src/regini.inc
U    packages/fcl-db/src/sqldb/interbase/ibconnection.pp
A    packages/fcl-registry/tests/tregtestframework.pp
U    packages/fcl-registry/fpmake.pp
U    packages/fcl-registry/src/winreg.inc
U    packages/fcl-registry/tests/tregistry2.pp
A    packages/fcl-registry/tests/regtestbasics.pp
U    packages/fcl-registry/src/xmlreg.pp
A    packages/fcl-registry/tests/regtcxmlreg.pp
U    packages/fcl-registry/tests/Makefile.fpc
D    packages/fcl-registry/tests/regtestframework.pp
D    packages/fcl-registry/tests/testbasics.pp
D    packages/fcl-registry/tests/tcxmlreg.pp
U    packages/fcl-registry/src/registry.pp
U    packages/rtl-extra/fpmake.pp
U    utils/fpdoc/fpdoc.pp
U    utils/fpdoc/dw_html.pp
U    utils/fpdoc/mkfpdoc.pp
U    utils/fpdoc/dw_latex.pp
U    utils/fpdoc/dw_xml.pp
U    utils/fpdoc/fpmake.pp
U    packages/fpmkunit/src/fpmkunit.pp
U    utils/fpdoc/dw_chm.pp
U    utils/fpdoc/dw_basehtml.pp
A    utils/fpdoc/fpdocstrs.pp
U    utils/fpdoc/dw_dxml.pp
U    utils/fpdoc/dw_txt.pp
U    utils/fpdoc/fpdocxmlopts.pas
U    packages/fcl-db/src/sqldb/sqldb.pp
U    packages/fv/src/views.pas
U    utils/fpdoc/dwriter.pp
U    utils/fpdoc/fpdoc.lpi
U    utils/fpdoc/dw_basemd.pp
U    utils/fpdoc/dw_man.pp
U    utils/fpdoc/fpdocproj.pas
U    packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
U    packages/rtl-extra/src/bsd/osdefs.inc
U    utils/fpdoc/dw_markdown.pp
U    utils/fpdoc/fpdocclasstree.pp
U    utils/fpdoc/dglobals.pp
U    utils/fpdoc/dw_linrtf.pp
U    utils/fpdoc/dwlinear.pp
U    utils/pas2js/dist/rtl.js
U    utils/fpdoc/fpclasschart.pp
U    utils/fpdoc/dw_ipflin.pas
U    utils/fpdoc/makeskel.pp
-- Aufzeichnung der Informationen für Zusammenführung von r47033 bis r48520 in ».«:
 U   .
-- Aufzeichnung der Informationen für Zusammenführung von r47033 bis r48520 in »rtl«:
 U   rtl
Konfliktübersicht:
  Textkonflikte: 3
Konfliktübersicht:
  Textkonflikte: 3


git-svn-id: https://svn.freepascal.org/svn/fpc/branches/tg74@48521 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 1 insertions, 7 deletions

diff --git a/avx512-0037785/compiler/pgenutil.pas b/avx512-0037785/compiler/pgenutil.pas
index a4de4abf13..4804995dbb 100644
--- a/avx512-0037785/compiler/pgenutil.pas
+++ b/avx512-0037785/compiler/pgenutil.pas
@@ -990,7 +990,7 @@ uses
                               paramdef2:=tconstsym(tstoreddef(def).genericparas[i]).constdef
                             else
                               paramdef2:=ttypesym(tstoreddef(def).genericparas[i]).typedef;
-                            if not equal_defs(paramdef2,paramdef2) then
+                            if not equal_defs(paramdef1,paramdef2) then
                               begin
                                 allequal:=false;
                                 break;
@@ -1379,8 +1379,6 @@ uses
         constraintdata : tgenericconstraintdata;
         old_block_type : tblock_type;
         fileinfo : tfileposinfo;
-        last_token : ttoken;
-        last_type_pos : tfileposinfo;
       begin
         result:=tfphashobjectlist.create(false);
         firstidx:=0;
@@ -1389,8 +1387,6 @@ uses
         block_type:=bt_type;
         allowconst:=true;
         is_const:=false;
-        last_token:=NOTOKEN;
-        last_type_pos:=current_filepos;
         repeat
           if allowconst and try_to_consume(_CONST) then
             begin
@@ -1605,8 +1601,6 @@ uses
               is_const:=false;
               allowconst:=true;
             end;
-          last_token:=token;
-          last_type_pos:=current_filepos;
         until not (try_to_consume(_COMMA) or try_to_consume(_SEMICOLON));
         { if the constant parameter is not terminated then the type restriction was
           not specified and we need to give an error }