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

* put the symtable(s) of the current unit back on the symtablestack before

Browse Source 
generating the resource strings, so that the defs generated by the typed
    constant builder get added to the correct unit

git-svn-id: branches/hlcgllvm@28761 -
This commit is contained in:
Jonas Maebe 2014-10-06 20:53:41 +00:00
parent 854fe2230a
commit 12836db931
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/cresstr.pas
View File

@ -37,7 +37,7 @@ uses
{$endif}
cclasses,widestr,
cutils,globtype,globals,systems,
symconst,symtype,symdef,symsym,
symbase,symconst,symtype,symdef,symsym,
verbose,fmodule,ppu,
aasmbase,aasmtai,aasmdata,aasmcnst,
aasmcpu;
@ -295,6 +295,10 @@ uses
var
resstrs : Tresourcestrings;
begin
{ needed for the typed constant defs that get generated/looked up }
if assigned(current_module.globalsymtable) then
symtablestack.push(current_module.globalsymtable);
symtablestack.push(current_module.localsymtable);
resstrs:=Tresourcestrings.Create;
resstrs.RegisterResourceStrings;
if not resstrs.List.Empty then
@ -304,6 +308,9 @@ uses
resstrs.WriteRSJFile;
end;
resstrs.Free;
symtablestack.pop(current_module.localsymtable);
if assigned(current_module.globalsymtable) then
symtablestack.pop(current_module.globalsymtable);
end;
end.