2
0
Эх сурвалжийг харах

* do not issue a hint of compiler procs are not inlined, resolves #33515

git-svn-id: trunk@38675 -
florian 7 жил өмнө
parent
commit
c46cbc8411

+ 1 - 0
.gitattributes

@@ -16096,6 +16096,7 @@ tests/webtbs/tw33439.pp svneol=native#text/pascal
 tests/webtbs/tw3348.pp svneol=native#text/plain
 tests/webtbs/tw3348.pp svneol=native#text/plain
 tests/webtbs/tw3349.pp svneol=native#text/plain
 tests/webtbs/tw3349.pp svneol=native#text/plain
 tests/webtbs/tw3351.pp svneol=native#text/plain
 tests/webtbs/tw3351.pp svneol=native#text/plain
+tests/webtbs/tw33515.pp svneol=native#text/pascal
 tests/webtbs/tw3353.pp svneol=native#text/plain
 tests/webtbs/tw3353.pp svneol=native#text/plain
 tests/webtbs/tw33542.pp svneol=native#text/pascal
 tests/webtbs/tw33542.pp svneol=native#text/pascal
 tests/webtbs/tw33548.pp svneol=native#text/plain
 tests/webtbs/tw33548.pp svneol=native#text/plain

+ 1 - 1
compiler/ncal.pas

@@ -4372,7 +4372,7 @@ implementation
              result:=pass1_inline
              result:=pass1_inline
            else
            else
              begin
              begin
-               if po_inline 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_h_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;

+ 8 - 0
tests/webtbs/tw33515.pp

@@ -0,0 +1,8 @@
+{ %OPT=-Seh }
+program Test;
+uses SysUtils;
+var
+  FS: TFormatSettings;
+begin
+  FS := DefaultFormatSettings;
+end.