Merge branch source:main into main

compiler/scanner.pas

@@ -371,6 +371,7 @@ implementation
 *****************************************************************************}
 
     const
+      DirectiveIgnored=pointer(1);
       { use any special name that is an invalid file name to avoid problems }
       preprocstring : array [preproctyp] of string[7]
         = ('$IFDEF','$IFNDEF','$IF','$IFOPT','$ELSE','$ELSEIF');
@@ -4567,7 +4568,7 @@ type
              end
             else
              begin
-               current_scanner.ignoredirectives.Add(hs,nil);
+               current_scanner.ignoredirectives.Add(hs,DirectiveIgnored);
                Message1(scan_w_illegal_directive,'$'+hs);
              end;
             { conditionals already read the comment }

compiler/symdef.pas

@@ -5693,7 +5693,10 @@ implementation
 
     function trecorddef.GetTypeName : string;
       begin
-         GetTypeName:='<record type>'
+        if assigned(typesym) then
+          GetTypeName:='<record type '+typesymbolprettyname+'>'
+        else
+          GetTypeName:='<record type>';
       end;
 
 {$ifdef DEBUG_NODE_XML}