diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-05 22:25:29 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-05 22:25:29 +0000 |
| commit | 7deddfded2d013c07a639873a4c90bfed40fd03e (patch) | |
| tree | 3df2a52207fec5bec55c28303aa57a8bd9b4e620 /gcc/cp/cvt.c | |
| parent | c79b54af83c8031caac515081fb7c56a127b90e3 (diff) | |
| download | gcc-7deddfded2d013c07a639873a4c90bfed40fd03e.tar.gz | |
2010-11-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 166377
2010-11-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 166377
* gcc/Makefile.in (MELT_RAW_CFLAGS): removed LIBELFINC
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@166380 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 00aa44aaa60..d2d6f4acdf9 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -314,7 +314,7 @@ build_up_reference (tree type, tree arg, int flags, tree decl) here because it needs to live as long as DECL. */ tree targ = arg; - arg = make_temporary_var_for_ref_to_temp (decl, TREE_TYPE (arg)); + arg = make_temporary_var_for_ref_to_temp (decl, target_type); /* Process the initializer for the declaration. */ DECL_INITIAL (arg) = targ; @@ -609,7 +609,10 @@ ocp_convert (tree type, tree expr, int convtype, int flags) return error_mark_node; } - e = integral_constant_value (e); + /* FIXME remove when moving to c_fully_fold model. */ + /* FIXME do we still need this test? */ + if (!CLASS_TYPE_P (type)) + e = integral_constant_value (e); if (error_operand_p (e)) return error_mark_node; |