PR c++/9844, PR c++/13989

PR c++/9844, PR c++/13989
Reviewed by Mark Mitchel.

From-SVN: r87971

1 files changed, 5 insertions, 0 deletions

diff --git a/gcc/tree.c b/gcc/tree.c
index a0cb800..0237d07 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -5642,10 +5642,15 @@ reconstruct_complex_type (tree type, tree bottom)
     }
   else if (TREE_CODE (type) == METHOD_TYPE)
     {
+      tree argtypes;
       inner = reconstruct_complex_type (TREE_TYPE (type), bottom);
+      /* The build_method_type_directly() routine prepends 'this' to argument list,
+         so we must compensate by getting rid of it.  */
+      argtypes = TYPE_ARG_TYPES (type);
       outer = build_method_type_directly (TYPE_METHOD_BASETYPE (type),
 					  inner,
 					  TYPE_ARG_TYPES (type));
+      TYPE_ARG_TYPES (outer) = argtypes;
     }
   else
     return bottom;