diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-21 23:18:29 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-21 23:18:29 +0000 |
| commit | 9a4ce580e758aec2235d58a1bfb10f981ba03c1b (patch) | |
| tree | dabaa00efe377d5263ce07cb883c8a9b2db26fbc /compiler/ncgcal.pas | |
| parent | 62a0ee1246bad4be564d632bd35af505f2c9eaab (diff) | |
| download | fpc-9a4ce580e758aec2235d58a1bfb10f981ba03c1b.tar.gz | |
* synchronised with trunk r29513
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/blocks@29514 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/ncgcal.pas')
| -rw-r--r-- | compiler/ncgcal.pas | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/compiler/ncgcal.pas b/compiler/ncgcal.pas index e0ca908b47..e9045f33ca 100644 --- a/compiler/ncgcal.pas +++ b/compiler/ncgcal.pas @@ -249,6 +249,7 @@ implementation href : treference; otlabel, oflabel : tasmlabel; + pushaddr: boolean; begin if not(assigned(parasym)) then internalerror(200304242); @@ -306,7 +307,7 @@ implementation begin { don't push a node that already generated a pointer type by address for implicit hidden parameters } - if (vo_is_funcret in parasym.varoptions) or + pushaddr:=(vo_is_funcret in parasym.varoptions) or { pass "this" in C++ classes explicitly as pointer because push_addr_param might not be true for them } (is_cppclass(parasym.vardef) and (vo_is_self in parasym.varoptions)) or @@ -324,8 +325,15 @@ implementation ) ) and paramanager.push_addr_param(parasym.varspez,parasym.vardef, - aktcallnode.procdefinition.proccalloption)) then - push_addr_para + aktcallnode.procdefinition.proccalloption)); + + if pushaddr then + begin + { objects or advanced records could be located in registers if they are the result of a type case, see e.g. webtbs\tw26075.pp } + if not(left.location.loc in [LOC_CREFERENCE,LOC_REFERENCE]) then + hlcg.location_force_mem(current_asmdata.CurrAsmList,left.location,left.resultdef); + push_addr_para + end else push_value_para; end @@ -918,8 +926,7 @@ implementation else begin { Load VMT value in register } - { todo: fix vmt type for high level cg } - hlcg.location_force_reg(current_asmdata.CurrAsmList,methodpointer.location,proc_addr_voidptrdef,proc_addr_voidptrdef,false); + hlcg.location_force_reg(current_asmdata.CurrAsmList,methodpointer.location,methodpointer.resultdef,methodpointer.resultdef,false); vmtreg:=methodpointer.location.register; { test validity of VMT } if not(is_interface(tprocdef(procdefinition).struct)) and @@ -1048,6 +1055,7 @@ implementation correct parameter register } if assigned(left) then begin + reorder_parameters; pushparas; { free the resources allocated for the parameters } freeparas; |