diff options
| author | Andrew Macleod <amacleod@redhat.com> | 2014-06-26 16:07:03 +0000 |
|---|---|---|
| committer | Andrew Macleod <amacleod@redhat.com> | 2014-06-26 16:07:03 +0000 |
| commit | ef1c4450cd394abfb3b31cc6ab9630dbc093b2af (patch) | |
| tree | a5d3fad7921f4709ca90c66896ce66362a3e9f7d | |
| parent | 3ec58ea1c2fb4af70e2a37a741ad3e49d96ef673 (diff) | |
remove value_ops, just allow value to access the op fields
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/re-arch2@212039 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/gimple-value-core.h | 13 | ||||
| -rw-r--r-- | gcc/gimple-value.h | 12 | ||||
| -rw-r--r-- | gcc/gimple-wrapper.h | 9 |
3 files changed, 6 insertions, 28 deletions
diff --git a/gcc/gimple-value-core.h b/gcc/gimple-value-core.h index be714e94334..f43543812d9 100644 --- a/gcc/gimple-value-core.h +++ b/gcc/gimple-value-core.h @@ -13,7 +13,7 @@ template<typename T> class _addr; #define FWD_DECL(NAME, BASE) typedef _dptr<class NAME ## _desc, BASE> NAME #define FWD_DECL_PTR(NAME) typedef _addr<NAME> NAME ## _ptr -typedef _ptr<class value_ops_desc> value; +FWD_DECL_BASE (value); FWD_DECL_BASE (type); FWD_DECL_BASE (block); @@ -236,24 +236,15 @@ class block_desc : public tree_desc class value_desc : public tree_desc { - protected: + public: inline value op (const int i) const; int op_len () const; - public: G::type type() const; void set_type (G::type); location_t expr_location () const; bool clobber_p () const; }; -class value_ops_desc : public value_desc -{ - public: - inline value op (const int i) const; - int op_len () const; -}; - - class unary_desc : public value_desc { public: diff --git a/gcc/gimple-value.h b/gcc/gimple-value.h index 72a82d90384..171a4b2bbf0 100644 --- a/gcc/gimple-value.h +++ b/gcc/gimple-value.h @@ -468,18 +468,6 @@ value_desc::expr_location() const return UNKNOWN_LOCATION; } -inline int -value_ops_desc::op_len () const -{ - return value_desc::op_len (); -} - -inline value -value_ops_desc::op(const int i) const -{ - return value_desc::op(i); -} - inline G::value unary_desc::op1 () const { diff --git a/gcc/gimple-wrapper.h b/gcc/gimple-wrapper.h index afe88dd3fc4..883781feb7e 100644 --- a/gcc/gimple-wrapper.h +++ b/gcc/gimple-wrapper.h @@ -328,20 +328,19 @@ create () } -typedef _ptr<value_ops_desc> value; - +typedef _ptr<value_desc> value; typedef _ptr<type_desc> type; typedef _ptr<block_desc> block; template<> inline void -_ptr<value_ops_desc>::check_contents() const +_ptr<value_desc>::check_contents() const { } template<> -inline _ptr<value_ops_desc> -_ptr<value_ops_desc>::create() +inline _ptr<value_desc> +_ptr<value_desc>::create() { gcc_unreachable (); } |