paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-24 03:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- reverted accidentally committed code with r32463

Browse Source 
git-svn-id: trunk@32476 -
This commit is contained in:
Jonas Maebe 2015-11-22 11:52:30 +00:00
parent 99c97c331a
commit ea0c8e6f38
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/ncgcal.pas
View File

@ -154,21 +154,10 @@ implementation
procedure tcgcallparanode.push_addr_para; procedure tcgcallparanode.push_addr_para;
var
valuedef: tdef;
begin begin
if not(left.location.loc in [LOC_CREFERENCE,LOC_REFERENCE]) then if not(left.location.loc in [LOC_CREFERENCE,LOC_REFERENCE]) then
internalerror(200304235); internalerror(200304235);
{ see the call to keep_para_array_range in ncal: if that call returned hlcg.a_loadaddr_ref_cgpara(current_asmdata.CurrAsmList,left.resultdef,left.location.reference,tempcgpara);
true, we overwrite the resultdef of left with its original resultdef
(to keep track of the range of the original arrat); we inserted a type
conversion to parasym.vardef, so that is the type this value actually
has }
if paramanager.keep_para_array_range(parasym.varspez,parasym.vardef,aktcallnode.procdefinition.proccalloption) then
valuedef:=parasym.vardef
else
valuedef:=left.resultdef;
hlcg.a_loadaddr_ref_cgpara(current_asmdata.CurrAsmList,valuedef,left.location.reference,tempcgpara);
end; end;

3
compiler/ncnv.pas
View File

@ -1606,12 +1606,13 @@ implementation
begin begin
{ a dynamic array is a pointer to an array, so to convert it to } { a dynamic array is a pointer to an array, so to convert it to }
{ an open array, we have to dereference it (JM) } { an open array, we have to dereference it (JM) }
result := ctypeconvnode.create_internal(left,cpointerdef.getreusable(resultdef)); result := ctypeconvnode.create_internal(left,voidpointertype);
typecheckpass(result); typecheckpass(result);
{ left is reused } { left is reused }
left := nil; left := nil;
result := cderefnode.create(result); result := cderefnode.create(result);
include(result.flags,nf_no_checkpointer); include(result.flags,nf_no_checkpointer);
result.resultdef := resultdef;
end; end;