From c1b8e1399f95bbedb88b5a37f9ba338b917f1d7f Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 12 Apr 2010 18:04:44 +0000 Subject: [PATCH] i386.c (x86_this_parameter): Handle aggregate for __thiscall convention. 2010-04-12 Kai Tietz PR/43702 * config/i386/i386.c (x86_this_parameter): Handle aggregate for __thiscall convention. From-SVN: r158232 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e46891f60be..0c7cb7fdccf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-04-12 Kai Tietz + + PR/43702 + * config/i386/i386.c (x86_this_parameter): Handle aggregate for + __thiscall convention. + 2010-04-12 Steve Ellcey * config/pa/pa.c (hppa_legitimize_address): Remove unused variable diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 2c6a09cad0c..b99fe2ae345 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -26232,11 +26232,13 @@ x86_this_parameter (tree function) if (lookup_attribute ("fastcall", TYPE_ATTRIBUTES (type))) regno = aggr ? DX_REG : CX_REG; - /* ???: To be verified. It is not absolutely clear how aggregates - have to be treated for thiscall. We assume that they are - identical to fastcall. */ else if (lookup_attribute ("thiscall", TYPE_ATTRIBUTES (type))) - regno = aggr ? DX_REG : CX_REG; + { + regno = CX_REG; + if (aggr) + return gen_rtx_MEM (SImode, + plus_constant (stack_pointer_rtx, 4)); + } else { regno = AX_REG;