Merge branch 'Pas2Js_Generic_Fix' into 'main'

Fixed generics generation in Pas2Js

See merge request freepascal.org/fpc/source!100

compiler/ncgld.pas

@@ -326,8 +326,12 @@ implementation
              else
                reference_reset_symbol(tvref,current_asmdata.WeakRefAsmSymbol(gvs.mangledname,AT_DATA),0,sizeof(pint),[]);
              { Enable size optimization with -Os or PIC code is generated and PIC uses GOT }
-             size_opt:=(cs_opt_size in current_settings.optimizerswitches)
+             size_opt:={$if defined(RISCV)}
-                       or ((cs_create_pic in current_settings.moduleswitches) and (tf_pic_uses_got in target_info.flags));
+                         true
+                       {$else defined(RISCV)}
+                         (cs_opt_size in current_settings.optimizerswitches)
+                         or ((cs_create_pic in current_settings.moduleswitches) and (tf_pic_uses_got in target_info.flags))
+                       {$endif defined(RISCV)};
              hreg_tv_rec:=NR_INVALID;
              if size_opt then
                begin

packages/fcl-passrc/src/pasresolver.pp

@@ -1470,7 +1470,8 @@ type
   TPRResolveAlias = (
     prraNone, // do not resolve alias
     prraSimple, // resolve alias, but not type alias
-    prraAlias // resolve alias and type alias
+    prraAlias, // resolve alias and type alias
+    prraHighType
     );
 
   TPRProcTypeDescFlag = (
@@ -24314,6 +24315,11 @@ begin
     if IsSameType(Arg1Resolved.HiTypeEl,Arg2Resolved.HiTypeEl,prraSimple) then
       exit(cExact);
     end
+  else if ResolveAlias=prraHighType then
+    begin
+    if IsSameType(Arg1Resolved.HiTypeEl,Arg2Resolved.HiTypeEl,prraNone) then
+      exit(cExact);
+    end
   else
     begin
     if IsSameType(Arg1Resolved.LoTypeEl,Arg2Resolved.LoTypeEl,prraNone) then
@@ -29220,8 +29226,8 @@ begin
     begin
     Param:=TPasElement(Params[i]);
     ComputeElement(Param,ResolvedEl,[rcType]);
-    ParamsResolved[i]:=ResolvedEl.LoTypeEl;
+    ParamsResolved[i]:=ResolvedEl.HiTypeEl;
-    if ResolvedEl.LoTypeEl<>TPasType(GenericTemplateList[i]) then
+    if ResolvedEl.HiTypeEl<>TPasType(GenericTemplateList[i]) then
       IsSelf:=false;
     end;
   if IsSelf then
@@ -29244,7 +29250,7 @@ begin
     while j>=0 do
       begin
       if not IsSameType(Item.Params[j],ParamsResolved[j],prraNone)
-          and (CheckElTypeCompatibility(Item.Params[j],ParamsResolved[j],prraNone)>cExact) then
+          and (CheckElTypeCompatibility(Item.Params[j],ParamsResolved[j],prraHighType)>cExact) then
         break;
       dec(j);
       end;