mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 10:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

c-ada-spec.c (is_tagged_type): Add guard for DECL_VINDEX.

Browse Source 
* c-ada-spec.c (is_tagged_type): Add guard for DECL_VINDEX.
	(dump_template_types): Adjust DECL_TEMPLATE_INSTANTIATIONS and
	DECL_TEMPLATE_RESULT emulations.
	(dump_ada_template)): Add guard for TYPE_METHODS.

From-SVN: r221088
This commit is contained in:
Eric Botcazou 2015-03-01 18:27:48 +00:00 committed by Eric Botcazou
parent 7dff0c749a
commit 83ed54d7ed
4 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/c-family/ChangeLog
View File

@ -1,3 +1,10 @@
2015-03-01 Eric Botcazou <ebotcazou@adacore.com>
* c-ada-spec.c (is_tagged_type): Add guard for DECL_VINDEX.
(dump_template_types): Adjust DECL_TEMPLATE_INSTANTIATIONS and
DECL_TEMPLATE_RESULT emulations.
(dump_ada_template)): Add guard for TYPE_METHODS.
2015-02-27 Marek Polacek <polacek@redhat.com>
PR c/65040

17
gcc/c-family/c-ada-spec.c
View File

@ -961,7 +961,7 @@ is_tagged_type (const_tree type)
return false;
for (tmp = TYPE_METHODS (type); tmp; tmp = TREE_CHAIN (tmp))
if (DECL_VINDEX (tmp))
if (TREE_CODE (tmp) == FUNCTION_DECL && DECL_VINDEX (tmp))
return true;
return false;
@ -1730,10 +1730,15 @@ dump_template_types (pretty_printer *buffer, tree types, int spc)
static int
dump_ada_template (pretty_printer *buffer, tree t, int spc)
{
/* DECL_VINDEX is DECL_TEMPLATE_INSTANTIATIONS in this context. */
tree inst = DECL_VINDEX (t);
/* DECL_RESULT_FLD is DECL_TEMPLATE_RESULT in this context. */
tree result = DECL_RESULT_FLD (t);
/* DECL_SIZE_UNIT is DECL_TEMPLATE_INSTANTIATIONS in this context. */
tree inst = DECL_SIZE_UNIT (t);
/* This emulates DECL_TEMPLATE_RESULT in this context. */
struct tree_template_decl {
struct tree_decl_common common;
tree arguments;
tree result;
};
tree result = ((struct tree_template_decl *) t)->result;
int num_inst = 0;
/* Don't look at template declarations declaring something coming from
@ -1750,7 +1755,7 @@ dump_ada_template (pretty_printer *buffer, tree t, int spc)
if (TREE_VEC_LENGTH (types) == 0)
break;
if (!TYPE_P (instance) || !TYPE_METHODS (instance))
if (!RECORD_OR_UNION_TYPE_P (instance) || !TYPE_METHODS (instance))
break;
num_inst++;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2015-03-01 Eric Botcazou <ebotcazou@adacore.com>
* g++.dg/other/dump-ada-spec-3.C: New test.
2015-03-01 Martin Liska <mliska@suse.cz>
* gcc.target/i386/stackalign/longlong-2.c: Omit ICF.

27
gcc/testsuite/g++.dg/other/dump-ada-spec-3.C Normal file
View File

@ -0,0 +1,27 @@
/* { dg-do compile } */
/* { dg-options "-fdump-ada-spec" } */
#include <iostream>
using namespace std;
class Base {
public:
int My_V;
virtual void Primitive ();
Base ();
};
void Base::Primitive () {
cout << "C++ Primitive " << this->My_V << "\n";
}
Base::Base () {
}
void Dispatch (Base * B) {
B->Primitive ();
}
/* { dg-final { cleanup-ada-spec } } */