OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/3624 (Internal error: Segmentation fault)

Browse Source 
cp:
	PR c++/3624
	* call.c (resolve_args): Simplify, call
	convert_from_reference.
	(build_new_op): Resolve and convert from reference ARG1
	earlier. Adjust ARG2 & ARG3 resolve and conversion.
testsuite:
	* g++.old-deja/g++.pt/crash68.C: New test.

From-SVN: r44388
This commit is contained in:
Nathan Sidwell 2001-07-26 08:12:00 +00:00 committed by Nathan Sidwell
parent 969fd501d6
commit 648c220695
4 changed files with 104 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2001-07-26 Nathan Sidwell <nathan@codesourcery.com>
PR c++/3624
* call.c (resolve_args): Simplify, call
convert_from_reference.
(build_new_op): Resolve and convert from reference ARG1
earlier. Adjust ARG2 & ARG3 resolve and conversion.
2001-07-26 Nathan Sidwell <nathan@codesourcery.com>
* decl.c (last_function_parm_tags): Remove.

37
gcc/cp/call.c
View File

@ -2556,15 +2556,19 @@ resolve_args (args)
tree t;
for (t = args; t; t = TREE_CHAIN (t))
{
if (TREE_VALUE (t) == error_mark_node)
tree arg = TREE_VALUE (t);
if (arg == error_mark_node)
return error_mark_node;
else if (TREE_CODE (TREE_TYPE (TREE_VALUE (t))) == VOID_TYPE)
else if (VOID_TYPE_P (TREE_TYPE (arg)))
{
error ("invalid use of void expression");
return error_mark_node;
}
else if (TREE_CODE (TREE_VALUE (t)) == OFFSET_REF)
TREE_VALUE (t) = resolve_offset_ref (TREE_VALUE (t));
else if (TREE_CODE (arg) == OFFSET_REF)
arg = resolve_offset_ref (arg);
arg = convert_from_reference (arg);
TREE_VALUE (t) = arg;
}
return args;
}
@ -3220,6 +3224,10 @@ build_new_op (code, flags, arg1, arg2, arg3)
else
fnname = ansi_opname (code);
if (TREE_CODE (arg1) == OFFSET_REF)
arg1 = resolve_offset_ref (arg1);
arg1 = convert_from_reference (arg1);
switch (code)
{
case NEW_EXPR:
@ -3236,19 +3244,18 @@ build_new_op (code, flags, arg1, arg2, arg3)
break;
}
/* The comma operator can have void args. */
if (TREE_CODE (arg1) == OFFSET_REF)
arg1 = resolve_offset_ref (arg1);
if (arg2 && TREE_CODE (arg2) == OFFSET_REF)
arg2 = resolve_offset_ref (arg2);
if (arg3 && TREE_CODE (arg3) == OFFSET_REF)
arg3 = resolve_offset_ref (arg3);
arg1 = convert_from_reference (arg1);
if (arg2)
arg2 = convert_from_reference (arg2);
{
if (TREE_CODE (arg2) == OFFSET_REF)
arg2 = resolve_offset_ref (arg2);
arg2 = convert_from_reference (arg2);
}
if (arg3)
arg3 = convert_from_reference (arg3);
{
if (TREE_CODE (arg3) == OFFSET_REF)
arg3 = resolve_offset_ref (arg3);
arg3 = convert_from_reference (arg3);
}
if (code == COND_EXPR)
{

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2001-07-26 Nathan Sidwell <nathan@codesourcery.com>
* g++.old-deja/g++.pt/crash68.C: New test.
2001-07-26 Nathan Sidwell <nathan@codesourcery.com>
* g++.old-deja/g++.other/crash42.C: New test.

70
gcc/testsuite/g++.old-deja/g++.pt/crash68.C Normal file
View File

@ -0,0 +1,70 @@
// Build don't link:
//
// Copyright (C) 2001 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 25 Jul 2001 <nathan@codesourcery.com>
// Origin: gustavo@geneura.ugr.es
// Bug 3624. Template instantiation of a reference type was not
// converted from reference when doing a call.
#include <iostream>
using namespace std;
template <class A, class B, class C, C& c, bool d> class eo: public A
{
public:
eo()
{
cout << this->x << " " << this->y << " "
<< c(*this) << " "
<< ((d)?"true":"false") << endl;
}
private:
B b;
};
struct XY
{
float x, y;
XY(): x(1), y(0.1) {}
};
float fitness(const XY& a)
{
return a.x + a.y;
}
struct fitness2
{
float operator()(const XY& a)
{
return a.x - a.y;
}
float f(const XY& a)
{
return a.x - a.y;
}
};
struct fitness3
{
float operator()(const XY& a)
{
return a.x / a.y;
}
};
fitness2 f2;
fitness3 f3;
int main()
{
eo<XY, float, fitness2, f2, true> eo2;
eo<XY, float, fitness3, f3, true> eo3;
return 0;
}