paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-01 00:42:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

* made message about subroutines not being inlined a note instead of a hint, see also #33515

Browse Source 
git-svn-id: trunk@38690 -
This commit is contained in:
florian 2018-04-05 09:51:25 +00:00
parent 0fd0e356e1
commit 42d6e81c33
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/msg/errore.msg
View File

@ -2481,7 +2481,7 @@ cg_e_function_not_support_by_selected_instruction_set=06056_E_The function used,
cg_f_max_units_reached=06057_F_Maximum number of units ($1) reached for the current target cg_f_max_units_reached=06057_F_Maximum number of units ($1) reached for the current target
% Depending of target architecture, the number of units is limited. This limit % Depending of target architecture, the number of units is limited. This limit
% has been reached. A unit counts only if it contains initialization or finalization count. % has been reached. A unit counts only if it contains initialization or finalization count.
cg_h_no_inline=06058_H_Call to subroutine "$1" marked as inline is not inlined cg_n_no_inline=06058_N_Call to subroutine "$1" marked as inline is not inlined
% The directive inline is only a hint to the compiler. Sometimes the compiler ignores this hint, a subroutine % The directive inline is only a hint to the compiler. Sometimes the compiler ignores this hint, a subroutine
% marked as inline is not inlined. In this case, this hint is given. Compiling with \var{-vd} might result in more information why % marked as inline is not inlined. In this case, this hint is given. Compiling with \var{-vd} might result in more information why
% the directive inline is ignored. % the directive inline is ignored.

2
compiler/msgidx.inc
View File

@ -689,7 +689,7 @@ const
cg_d_autoinlining=06055; cg_d_autoinlining=06055;
cg_e_function_not_support_by_selected_instruction_set=06056; cg_e_function_not_support_by_selected_instruction_set=06056;
cg_f_max_units_reached=06057; cg_f_max_units_reached=06057;
cg_h_no_inline=06058; cg_n_no_inline=06058;
asmr_d_start_reading=07000; asmr_d_start_reading=07000;
asmr_d_finish_reading=07001; asmr_d_finish_reading=07001;
asmr_e_none_label_contain_at=07002; asmr_e_none_label_contain_at=07002;

2
compiler/msgtxt.inc
View File

@ -863,7 +863,7 @@ const msgtxt : array[0..000340,1..240] of char=(
'06056_E_The function used, is not supported by the selected instructio'+ '06056_E_The function used, is not supported by the selected instructio'+
'n set: $1'#000+ 'n set: $1'#000+
'06057_F_Maximum number of units ($1) reached for the curr','ent target'#000+ '06057_F_Maximum number of units ($1) reached for the curr','ent target'#000+
'06058_H_Call to subroutine "$1" marked as inline is not inlined'#000+ '06058_N_Call to subroutine "$1" marked as inline is not inlined'#000+
'07000_DL_Starting $1 styled assembler parsing'#000+ '07000_DL_Starting $1 styled assembler parsing'#000+
'07001_DL_Finished $1 styled assembler parsing'#000+ '07001_DL_Finished $1 styled assembler parsing'#000+
'07002_E_Non-label pattern contains @'#000+ '07002_E_Non-label pattern contains @'#000+

2
compiler/ncal.pas
View File

@ -4373,7 +4373,7 @@ implementation
else else
begin begin
if (po_inline in procdefinition.procoptions) and not(po_compilerproc in procdefinition.procoptions) then if (po_inline in procdefinition.procoptions) and not(po_compilerproc in procdefinition.procoptions) then
Message1(cg_h_no_inline,tprocdef(procdefinition).customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker])); Message1(cg_n_no_inline,tprocdef(procdefinition).customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker]));
mark_unregable_parameters; mark_unregable_parameters;
result:=pass1_normal; result:=pass1_normal;
end; end;

2
tests/webtbf/tw31717.pp
View File

@ -1,5 +1,5 @@
{ %fail } { %fail }
{ %OPT=-vh -Seh } { %OPT=-vn -Sen }
{$mode objfpc} {$mode objfpc}
program Project1; program Project1;