diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-10 15:13:54 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-10 15:13:54 +0000 |
| commit | 8cff878b277f9af6c2827a87581baac5f768e12a (patch) | |
| tree | d4e178503efd243eed24ff3b753cd998370d75d4 /gcc/cp/vtable-class-hierarchy.c | |
| parent | 9610b14f8599a9db94822d3f0923b58b2f1177dc (diff) | |
| download | gcc-8cff878b277f9af6c2827a87581baac5f768e12a.tar.gz | |
[./]
2016-02-10 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with some of GCC 6, using
svn merge -r222130:226090 ^/trunk ; UNSTABLE}}
[gcc/]
2016-02-10 Basile Starynkevitch <basile@starynkevitch.net>
{{ merging with trunk 226090 ; UNSTABLE }}
* melt-run.proto.h: include tree-ssa-scopedtables.h
* tree-ssa-dom.c: skip second record_edge_info
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@233272 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/vtable-class-hierarchy.c')
| -rw-r--r-- | gcc/cp/vtable-class-hierarchy.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c index a138ee4e43b..2c59f14f389 100644 --- a/gcc/cp/vtable-class-hierarchy.c +++ b/gcc/cp/vtable-class-hierarchy.c @@ -115,18 +115,9 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "cp-tree.h" #include "output.h" -#include "hash-map.h" -#include "is-a.h" -#include "plugin-api.h" -#include "vec.h" -#include "hashtab.h" -#include "hash-set.h" -#include "machmode.h" #include "tm.h" #include "hard-reg-set.h" -#include "input.h" #include "function.h" -#include "ipa-ref.h" #include "cgraph.h" #include "tree-iterator.h" #include "vtable-verify.h" @@ -566,11 +557,11 @@ register_construction_vtables (tree base_class, tree record_type, if (TREE_OPERAND (value, 0)) val_vtbl_decl = TREE_OPERAND (value, 0); - while (TREE_CODE (val_vtbl_decl) != VAR_DECL + while (!VAR_P (val_vtbl_decl) && TREE_OPERAND (val_vtbl_decl, 0)) val_vtbl_decl = TREE_OPERAND (val_vtbl_decl, 0); - gcc_assert (TREE_CODE (val_vtbl_decl) == VAR_DECL); + gcc_assert (VAR_P (val_vtbl_decl)); /* Check to see if we already have this vtable pointer in our valid set for this base class. */ @@ -885,7 +876,7 @@ output_set_info (tree record_type, vec<tree> vtbl_ptr_array) if (TREE_CODE (arg0) == ADDR_EXPR) arg0 = TREE_OPERAND (arg0, 0); - if (TREE_CODE (arg0) == VAR_DECL) + if (VAR_P (arg0)) vptr_name = IDENTIFIER_POINTER (DECL_NAME (arg0)); if (TREE_CODE (arg1) == INTEGER_CST) |