Merge branch 'FixVisibility' into 'main'

Fix for visibility information when a function is a publish declaration.

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

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/pastojs/src/fppas2js.pp

@@ -20945,11 +20945,14 @@ var
   ResultTypeInfo: TJSElement;
   Call: TJSCallExpression;
   Flags: Integer;
-  ExtVis: word;
+  ExtVis: Integer;
 
   procedure AddExtRTTIVisibility;
   begin
-    Call.AddArg(CreateLiteralNumber(Proc,ExtVis));
+    if ExtVis > -1 then
+      Call.AddArg(CreateLiteralNumber(Proc,ExtVis));
+
+    ExtVis := -1;
   end;
 
   procedure AddOption(const aName: String; JS: TJSElement);
@@ -20959,8 +20962,7 @@ var
     if JS=nil then exit;
     if OptionsEl=nil then
       begin
-      if ExtVis=ExtRTTIVisDefaultMethod then
+      AddExtRTTIVisibility;
-        AddExtRTTIVisibility;
       OptionsEl:=TJSObjectLiteral(CreateElement(TJSObjectLiteral,Proc));
       Call.AddArg(OptionsEl);
       end;
@@ -21054,10 +21056,19 @@ begin
       ResultEl:=TPasFunction(Proc).FuncType.ResultEl;
       ResultTypeInfo:=CreateTypeInfoRef(ResultEl.ResultType,AContext,ResultEl);
       if ResultTypeInfo<>nil then
+        begin
+        AddExtRTTIVisibility;
+
         Call.AddArg(ResultTypeInfo);
+        end;
       end;
+
     if (ResultTypeInfo=nil) and ((Flags>0) or (length(Attr)>0)) then
+    begin
+      AddExtRTTIVisibility;
+
       Call.AddArg(CreateLiteralNull(Proc));
+    end;
 
     // flags if needed
     if (Flags>0) or (length(Attr)>0) then