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

re PR lto/69133 (LTO segfault in lto_get_decl_name_mapping() on 483.xalancbmk with -flto-partition=none) 

PR lto/69133
	* cgraphunit.c (cgraph_node::expand_thunk): When forcing gimple
	assume that the node has body.
	* cgraph.c (cgraph_node::get_untransformed_body): Use gimple_body_p
	check.
	* g++.dg/lto/pr69133_0.C: New testcase.
	* g++.dg/lto/pr69133_1.C: New testcase.

From-SVN: r232552
This commit is contained in:
Jan Hubicka 2016-01-19 12:57:41 +01:00 committed by Jan Hubicka
parent 150be262b9
commit e9191ad3ab
6 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2016-01-19 Jan Hubicka <hubicka@ucw.cz>
PR lto/69133
* cgraphunit.c (cgraph_node::expand_thunk): When forcing gimple
assume that the node has body.
* cgraph.c (cgraph_node::get_untransformed_body): Use gimple_body_p
check.
2016-01-19 Jan Hubicka <hubicka@ucw.cz>
* lto-streamer-out.c (lto_output): Do not stream instrumentation

6
gcc/cgraph.c
View File

@ -3305,10 +3305,12 @@ cgraph_node::get_untransformed_body (void)
size_t len;
tree decl = this->decl;
if (DECL_RESULT (decl))
/* Check if body is already there. Either we have gimple body or
the function is thunk and in that case we set DECL_ARGUMENTS. */
if (DECL_ARGUMENTS (decl) || gimple_has_body_p (decl))
return false;
gcc_assert (in_lto_p);
gcc_assert (in_lto_p && !DECL_RESULT (decl));
timevar_push (TV_IPA_LTO_GIMPLE_IN);

4
gcc/cgraphunit.c
View File

@ -1664,7 +1664,9 @@ cgraph_node::expand_thunk (bool output_asm_thunks, bool force_gimple_thunk)
greturn *ret;
bool alias_is_noreturn = TREE_THIS_VOLATILE (alias);
if (in_lto_p)
/* We may be called from expand_thunk that releses body except for
DECL_ARGUMENTS. In this case force_gimple_thunk is true. */
if (in_lto_p && !force_gimple_thunk)
get_untransformed_body ();
a = DECL_ARGUMENTS (thunk_fndecl);

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2016-01-19 Jan Hubicka <hubicka@ucw.cz>
PR lto/69133
* g++.dg/lto/pr69133_0.C: New testcase.
* g++.dg/lto/pr69133_1.C: New testcase.
2016-01-15 Jeff Law <law@redhat.com>
PR tree-optimization/69320

19
gcc/testsuite/g++.dg/lto/pr69133_0.C Normal file
View File

@ -0,0 +1,19 @@
// { dg-lto-do link }
// { dg-lto-options { { -flto -O2 } } }
// { dg-extra-ld-options "-r -nostdlib -flto -flto-partition=none -O2" }
namespace xercesc_3_1 {
class XMLEntityHandler {
public:
virtual ~XMLEntityHandler();
virtual void m_fn1();
virtual bool m_fn2();
virtual void m_fn3();
virtual int m_fn4();
virtual void m_fn5();
} * a;
void fn1() {
a->m_fn5();
a->m_fn1();
}
}

22
gcc/testsuite/g++.dg/lto/pr69133_1.C Normal file
View File

@ -0,0 +1,22 @@
namespace xercesc_3_1 {
class A {
virtual void m_fn1();
};
class XMLEntityHandler {
public:
virtual ~XMLEntityHandler();
virtual void m_fn2(const int &);
virtual bool m_fn3();
virtual void m_fn4();
virtual int m_fn5() = 0;
virtual void m_fn6(const int &);
};
class B : A, XMLEntityHandler {};
class C : B {
void m_fn2(const int &);
void m_fn6(const int &);
};
void C::m_fn2(const int &) {}
void C::m_fn6(const int &) {}
}