paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-15 10:51:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

pastojs: fixed -OoShortRefGlobals

Browse Source 
git-svn-id: trunk@47616 -
(cherry picked from commit fc04a83ff5)
This commit is contained in:
Mattias Gaertner 2020-11-28 13:09:02 +00:00 committed by Florian Klämpfl
parent e61f1873fe
commit 90031dcfa7
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/pastojs/src/fppas2js.pp
View File

@ -15374,7 +15374,7 @@ var
C: TClass;
AssignSt: TJSSimpleAssignStatement;
NeedInitFunction, HasConstructor, IsJSFunction, NeedClassExt,
SpecializeDelay: Boolean;
SpecializeDelay, NeedTypeInfo: Boolean;
Proc: TPasProcedure;
begin
Result:=nil;
@ -15483,6 +15483,7 @@ begin
end;
NeedInitFunction:=true;
NeedTypeInfo:=(pcsfPublished in Scope.Flags) or HasTypeInfo(El,AContext);
IntfKind:='';
if El.ObjKind=okInterface then
begin
@ -15493,8 +15494,7 @@ begin
else
RaiseNotSupported(El,AContext,20180405093512);
end;
NeedInitFunction:=(pcsfPublished in Scope.Flags) or HasTypeInfo(El,AContext)
or (IntfKind<>'') or (coShortRefGlobals in Options);
NeedInitFunction:=NeedTypeInfo or (IntfKind<>'') or (coShortRefGlobals in Options);
end;
if NeedInitFunction then
@ -15636,11 +15636,14 @@ begin
AddClassSupportedInterfaces(El,Src,FuncContext);
AddClassMessageIds(El,Src,FuncContext,pbivnMessageInt);
AddClassMessageIds(El,Src,FuncContext,pbivnMessageStr);
// add RTTI init function
if SpecializeDelay then
AddClassRTTI(El,DelaySrc,DelayFuncContext)
else
AddClassRTTI(El,Src,FuncContext);
if NeedTypeInfo then
begin
// add RTTI init function
if SpecializeDelay then
AddClassRTTI(El,DelaySrc,DelayFuncContext)
else
AddClassRTTI(El,Src,FuncContext);
end;
end;
end;// end of init function

2
packages/pastojs/src/pas2jscompiler.pp
View File

@ -3763,7 +3763,7 @@ begin
'enumnumbers': SetOption(coEnumValuesAsNumbers,Enable);
'removenotusedprivates': SetOption(coKeepNotUsedPrivates,not Enable);
'removenotuseddeclarations': SetOption(coKeepNotUsedDeclarationsWPO,not Enable);
'shortrefglobals': SetOption(coShortRefGlobals,not Enable);
'shortrefglobals': SetOption(coShortRefGlobals,Enable);
else
Log.LogMsgIgnoreFilter(nUnknownOptimizationOption,[QuoteStr(aValue)]);
end;

1
packages/pastojs/tests/tcprecompile.pas
View File

@ -130,6 +130,7 @@ begin
Params.AddStrings(SharedParams);
if SecondRunParams<>nil then
Params.AddStrings(SecondRunParams);
writeln('BBB1 TCustomTestCLI_Precompile.CheckPrecompile ',Params.Text);
Compile([MainFile,'-FU'+UnitOutputDir],ExpExitCode);
if ExpExitCode=0 then
begin