mcf is working on our pass but fails on another

1 files changed, 14 insertions, 1 deletions

diff --git a/gcc/type-escaper.c b/gcc/type-escaper.c
index ef81af37589..870c2453bba 100644
--- a/gcc/type-escaper.c
+++ b/gcc/type-escaper.c
@@ -115,7 +115,8 @@ TypeEscaper::_update(const_tree t)
   Reason _is_volatile;
   _is_volatile.type_is_volatile = is_volatile;
   Reason _inner = _reason | _is_volatile;
-  _inner.type_is_casted = _inside_indirect_field ? false : _inner.type_is_casted;
+  _inner.type_is_casted = _inside_indirect_field > 0 ? false : _inner.type_is_casted;
+  if (_inside_function > 0) _inner.type_is_casted = false;
   already_in_typemap ? calc[t] |= _inner : calc[t] = _inner;
 }
 
@@ -184,9 +185,21 @@ TypeEscaper::_walk_UNION_TYPE_post(const_tree t)
 void
 TypeEscaper::_walk_FUNCTION_TYPE_pre(const_tree t)
 {
+  _inside_function++;
 }
 
 void
+TypeEscaper::_walk_FUNCTION_TYPE_post(const_tree t)
+{
+  _inside_function--;
+}
+void
+TypeEscaper::_walk_function_or_method(const_tree t)
+{
+}
+
+
+void
 TypeEscaper::_walk_FUNCTION_TYPE(const_tree t)
 {
 }