Update test 23.

6 files changed, 1657 insertions, 831 deletions

diff --git a/test/test23-01.txt b/test/test23-01.txt
index fdbc435..f1ebb96 100644
--- a/test/test23-01.txt
+++ b/test/test23-01.txt
@@ -21888,965 +21888,965 @@ function_decl fill /usr/include/c++/5/bits/stl_bvector.h 398:3
           type_decl bool <built-in> 0:0 - type name
           - isAutogenerated: 1
         integer_cst 64 - parm size
-function_decl Data1 test23.cpp 8:5
+function_decl Data1 test23.cpp 12:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test23.cpp 9:5 - function result
+ result_decl test23.cpp 13:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 8:11 - argument
+ parm_decl this test23.cpp 12:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 10:5 - code
+ bind_expr test23.cpp 14:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 9:5 - statement
-    expr_stmt test23.cpp 9:5 - operand
-     call_expr test23.cpp 9:5 - expresssion
+   cleanup_point_expr test23.cpp 13:5 - statement
+    expr_stmt test23.cpp 13:5 - operand
+     call_expr test23.cpp 13:5 - expresssion
       addr_expr - function
        function_decl __comp_ctor  /usr/include/c++/5/bits/basic_string.h 2838:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test23.cpp 9:5 - operand
+       component_ref test23.cpp 13:5 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 8:11 - operand
+          parm_decl this test23.cpp 12:11 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 20:17 - field
+        field_decl str1 test23.cpp 24:17 - field
         - signed
          integer_cst 64 - decl size
-   cleanup_stmt test23.cpp 9:5 - statement
+   cleanup_stmt test23.cpp 13:5 - statement
     statement_list - body
-    call_expr test23.cpp 9:5 - expresssion
+    call_expr test23.cpp 13:5 - expresssion
      addr_expr - function
       function_decl __comp_dtor  /usr/include/c++/5/bits/basic_string.h 2942:7 - operand
       - isExternal: 1
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      component_ref test23.cpp 9:5 - operand
+      component_ref test23.cpp 13:5 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 8:11 - operand
+         parm_decl this test23.cpp 12:11 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 20:17 - field
+       field_decl str1 test23.cpp 24:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 8:5
+function_decl __base_ctor  test23.cpp 12:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test23.cpp 10:5 - function result
+ result_decl test23.cpp 14:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 8:11 - argument
+ parm_decl this test23.cpp 12:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 10:5 - code
+ bind_expr test23.cpp 14:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 9:5 - statement
-    expr_stmt test23.cpp 9:5 - operand
-     call_expr test23.cpp 9:5 - expresssion
+   cleanup_point_expr test23.cpp 13:5 - statement
+    expr_stmt test23.cpp 13:5 - operand
+     call_expr test23.cpp 13:5 - expresssion
       addr_expr - function
        function_decl __comp_ctor  /usr/include/c++/5/bits/basic_string.h 2838:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test23.cpp 9:5 - operand
+       component_ref test23.cpp 13:5 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 8:11 - operand
+          parm_decl this test23.cpp 12:11 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 20:17 - field
+        field_decl str1 test23.cpp 24:17 - field
         - signed
          integer_cst 64 - decl size
-   try_catch_expr test23.cpp 9:5 - statement
+   try_catch_expr test23.cpp 13:5 - statement
     statement_list - operand
-    call_expr test23.cpp 9:5 - operand
+    call_expr test23.cpp 13:5 - operand
      addr_expr - function
       function_decl __comp_dtor  /usr/include/c++/5/bits/basic_string.h 2942:7 - operand
       - isExternal: 1
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      component_ref test23.cpp 9:5 - operand
+      component_ref test23.cpp 13:5 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 8:11 - operand
+         parm_decl this test23.cpp 12:11 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 20:17 - field
+       field_decl str1 test23.cpp 24:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 8:5
+function_decl __comp_ctor  test23.cpp 12:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test23.cpp 10:5 - function result
+ result_decl test23.cpp 14:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 8:11 - argument
+ parm_decl this test23.cpp 12:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl Data1 test23.cpp 12:5
+function_decl Data1 test23.cpp 16:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 12:24 - function result
+ result_decl test23.cpp 16:24 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 12:22 - argument
+ parm_decl this test23.cpp 16:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 12:18 - argument
+ parm_decl ptr0 test23.cpp 16:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 15:5 - code
+ bind_expr test23.cpp 19:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 13:20 - statement
-    expr_stmt test23.cpp 13:20 - operand
+   cleanup_point_expr test23.cpp 17:20 - statement
+    expr_stmt test23.cpp 17:20 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 13:20 - operand
+       component_ref test23.cpp 17:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:22 - operand
+          parm_decl this test23.cpp 16:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl ptrval test23.cpp 18:12 - field
+        field_decl ptrval test23.cpp 22:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr0 test23.cpp 12:18 - operand
+       parm_decl ptr0 test23.cpp 16:18 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 13:20 - statement
-    expr_stmt test23.cpp 13:20 - operand
-     call_expr test23.cpp 13:20 - expresssion
+   cleanup_point_expr test23.cpp 17:20 - statement
+    expr_stmt test23.cpp 17:20 - operand
+     call_expr test23.cpp 17:20 - expresssion
       addr_expr - function
        function_decl __comp_ctor  /usr/include/c++/5/bits/basic_string.h 2838:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test23.cpp 13:20 - operand
+       component_ref test23.cpp 17:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:22 - operand
+          parm_decl this test23.cpp 16:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 20:17 - field
+        field_decl str1 test23.cpp 24:17 - field
         - signed
          integer_cst 64 - decl size
-   cleanup_stmt test23.cpp 13:20 - statement
+   cleanup_stmt test23.cpp 17:20 - statement
     statement_list - body
-    call_expr test23.cpp 13:20 - expresssion
+    call_expr test23.cpp 17:20 - expresssion
      addr_expr - function
       function_decl __comp_dtor  /usr/include/c++/5/bits/basic_string.h 2942:7 - operand
       - isExternal: 1
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      component_ref test23.cpp 13:20 - operand
+      component_ref test23.cpp 17:20 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 12:22 - operand
+         parm_decl this test23.cpp 16:22 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 20:17 - field
+       field_decl str1 test23.cpp 24:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 12:5
+function_decl __base_ctor  test23.cpp 16:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 15:5 - function result
+ result_decl test23.cpp 19:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 12:22 - argument
+ parm_decl this test23.cpp 16:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 12:18 - argument
+ parm_decl ptr0 test23.cpp 16:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 15:5 - code
+ bind_expr test23.cpp 19:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 13:20 - statement
-    expr_stmt test23.cpp 13:20 - operand
+   cleanup_point_expr test23.cpp 17:20 - statement
+    expr_stmt test23.cpp 17:20 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 13:20 - operand
+       component_ref test23.cpp 17:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:22 - operand
+          parm_decl this test23.cpp 16:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl ptrval test23.cpp 18:12 - field
+        field_decl ptrval test23.cpp 22:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr0 test23.cpp 12:18 - operand
+       parm_decl ptr0 test23.cpp 16:18 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 13:20 - statement
-    expr_stmt test23.cpp 13:20 - operand
-     call_expr test23.cpp 13:20 - expresssion
+   cleanup_point_expr test23.cpp 17:20 - statement
+    expr_stmt test23.cpp 17:20 - operand
+     call_expr test23.cpp 17:20 - expresssion
       addr_expr - function
        function_decl __comp_ctor  /usr/include/c++/5/bits/basic_string.h 2838:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test23.cpp 13:20 - operand
+       component_ref test23.cpp 17:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:22 - operand
+          parm_decl this test23.cpp 16:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 6:8 - type name
+             type_decl Data1 test23.cpp 10:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 17:9 - field
+             field_decl val test23.cpp 21:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 18:12 - field
+             field_decl ptrval test23.cpp 22:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 19:14 - field
+             field_decl arr test23.cpp 23:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 20:17 - field
+             field_decl str1 test23.cpp 24:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 7:1 - field
+             type_decl Data1 test23.cpp 11:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 20:17 - field
+        field_decl str1 test23.cpp 24:17 - field
         - signed
          integer_cst 64 - decl size
-   try_catch_expr test23.cpp 13:20 - statement
+   try_catch_expr test23.cpp 17:20 - statement
     statement_list - operand
-    call_expr test23.cpp 13:20 - operand
+    call_expr test23.cpp 17:20 - operand
      addr_expr - function
       function_decl __comp_dtor  /usr/include/c++/5/bits/basic_string.h 2942:7 - operand
       - isExternal: 1
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      component_ref test23.cpp 13:20 - operand
+      component_ref test23.cpp 17:20 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 12:22 - operand
+         parm_decl this test23.cpp 16:22 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 20:17 - field
+       field_decl str1 test23.cpp 24:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 12:5
+function_decl __comp_ctor  test23.cpp 16:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 15:5 - function result
+ result_decl test23.cpp 19:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test23.cpp 12:22 - argument
+ parm_decl this test23.cpp 16:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 12:18 - argument
+ parm_decl ptr0 test23.cpp 16:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl ftest1 test23.cpp 22:9
+function_decl ftest1 test23.cpp 26:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -22858,46 +22858,46 @@ function_decl ftest1 test23.cpp 22:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Data1 test23.cpp 6:8 - type name
+   type_decl Data1 test23.cpp 10:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 17:9 - field
+   field_decl val test23.cpp 21:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 18:12 - field
+   field_decl ptrval test23.cpp 22:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 19:14 - field
+   field_decl arr test23.cpp 23:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 20:17 - field
+   field_decl str1 test23.cpp 24:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 7:1 - field
+   type_decl Data1 test23.cpp 11:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test23.cpp 23:5 - function result
+ result_decl test23.cpp 27:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -22908,30 +22908,30 @@ function_decl ftest1 test23.cpp 22:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test23.cpp 22:16 - argument
+ parm_decl this test23.cpp 26:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test23.cpp 24:16 - code
+ return_expr test23.cpp 28:16 - code
   init_expr - operand
-   result_decl test23.cpp 23:5 - operand
+   result_decl test23.cpp 27:5 - operand
    - isAutogenerated: 1
     integer_type - result type
     - precisionBits: 32
@@ -22943,7 +22943,7 @@ function_decl ftest1 test23.cpp 22:9
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl ftest2 test23.cpp 27:16
+function_decl ftest2 test23.cpp 31:16
 - isPublic: 1
  function_type - function type
   integer_type - function return type
@@ -22957,27 +22957,27 @@ function_decl ftest2 test23.cpp 27:16
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 6:8 - type name
+     type_decl Data1 test23.cpp 10:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 17:9 - field
+     field_decl val test23.cpp 21:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 18:12 - field
+     field_decl ptrval test23.cpp 22:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 19:14 - field
+     field_decl arr test23.cpp 23:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 20:17 - field
+     field_decl str1 test23.cpp 24:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 7:1 - field
+     type_decl Data1 test23.cpp 11:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test23.cpp 28:5 - function result
+ result_decl test23.cpp 32:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -22988,29 +22988,29 @@ function_decl ftest2 test23.cpp 27:16
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl ptr0 test23.cpp 27:30 - argument
+ parm_decl ptr0 test23.cpp 31:30 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test23.cpp 29:16 - code
+ return_expr test23.cpp 33:16 - code
   init_expr - operand
-   result_decl test23.cpp 28:5 - operand
+   result_decl test23.cpp 32:5 - operand
    - isAutogenerated: 1
     integer_type - result type
     - precisionBits: 32
@@ -23022,1503 +23022,2093 @@ function_decl ftest2 test23.cpp 27:16
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl Object1 test23.cpp 39:5
+function_decl ftest3 test23.cpp 36:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Data1 test23.cpp 10:8 - type name
+   - isAutogenerated: 1
+   field_decl val test23.cpp 21:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test23.cpp 22:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test23.cpp 23:14 - field
+   - signed
+    integer_cst 96 - decl size
+   field_decl str1 test23.cpp 24:17 - field
+   - signed
+    integer_cst 64 - decl size
+   type_decl Data1 test23.cpp 11:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test23.cpp 10:8 - type name
+     - isAutogenerated: 1
+     field_decl val test23.cpp 21:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test23.cpp 22:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test23.cpp 23:14 - field
+     - signed
+      integer_cst 96 - decl size
+     field_decl str1 test23.cpp 24:17 - field
+     - signed
+      integer_cst 64 - decl size
+     type_decl Data1 test23.cpp 11:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 10:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 21:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 22:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 23:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 24:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 11:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 37:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test23.cpp 36:28 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 10:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 21:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 22:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 23:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 24:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 11:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ parm_decl ptr0 test23.cpp 36:24 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 10:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 21:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 22:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 23:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 24:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 11:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl Object1 test23.cpp 47:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 39:26 - function result
+ result_decl test23.cpp 47:26 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 39:24 - argument
+ parm_decl this test23.cpp 47:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 39:20 - argument
+ parm_decl ptr1 test23.cpp 47:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 47:5 - code
+ bind_expr test23.cpp 55:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 40:21 - statement
-    expr_stmt test23.cpp 40:21 - operand
+   cleanup_point_expr test23.cpp 48:21 - statement
+    expr_stmt test23.cpp 48:21 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 40:21 - operand
+       component_ref test23.cpp 48:21 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl this test23.cpp 39:24 - operand
+          parm_decl this test23.cpp 47:24 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Object1 test23.cpp 35:7 - type name
+             type_decl Object1 test23.cpp 43:7 - type name
              - isAutogenerated: 1
-             field_decl dataptr test23.cpp 37:12 - field
+             field_decl dataptr test23.cpp 45:12 - field
              - unsigned
               integer_cst 64 - decl size
-             type_decl Object1 test23.cpp 36:1 - field
+             type_decl Object1 test23.cpp 44:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl dataptr test23.cpp 37:12 - field
+        field_decl dataptr test23.cpp 45:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 39:20 - operand
+       parm_decl ptr1 test23.cpp 47:20 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   if_stmt test23.cpp 42:9 - statement
+   if_stmt test23.cpp 50:9 - statement
     ne_expr - condition
-     component_ref test23.cpp 42:13 - operand
+     component_ref test23.cpp 50:13 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 39:24 - operand
+        parm_decl this test23.cpp 47:24 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 35:7 - type name
+           type_decl Object1 test23.cpp 43:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 37:12 - field
+           field_decl dataptr test23.cpp 45:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 36:1 - field
+           type_decl Object1 test23.cpp 44:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 37:12 - field
+      field_decl dataptr test23.cpp 45:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    cleanup_point_expr test23.cpp 44:27 - then
-     expr_stmt test23.cpp 44:27 - operand
+    cleanup_point_expr test23.cpp 52:27 - then
+     expr_stmt test23.cpp 52:27 - operand
       convert_expr - expresssion
-       call_expr test23.cpp 44:25 - operand
+       call_expr test23.cpp 52:25 - operand
         addr_expr - function
-         function_decl ftest1 test23.cpp 22:9 - operand
+         function_decl ftest1 test23.cpp 26:9 - operand
          - isExternal: 1
          - isPublic: 1
           method_type - function type
         non_lvalue_expr - arg
          - isUsed: 1
-         parm_decl ptr1 test23.cpp 39:20 - operand
+         parm_decl ptr1 test23.cpp 47:20 - operand
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 46:26 - statement
-    expr_stmt test23.cpp 46:26 - operand
+   cleanup_point_expr test23.cpp 54:26 - statement
+    expr_stmt test23.cpp 54:26 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 46:24 - operand
+      call_expr test23.cpp 54:24 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        non_lvalue_expr - arg
-        component_ref test23.cpp 46:9 - operand
+        component_ref test23.cpp 54:9 - operand
          indirect_ref - object
           nop_expr - ref
            - isUsed: 1
-           parm_decl this test23.cpp 39:24 - operand
+           parm_decl this test23.cpp 47:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
-              type_decl Object1 test23.cpp 35:7 - type name
+              type_decl Object1 test23.cpp 43:7 - type name
               - isAutogenerated: 1
-              field_decl dataptr test23.cpp 37:12 - field
+              field_decl dataptr test23.cpp 45:12 - field
               - unsigned
                integer_cst 64 - decl size
-              type_decl Object1 test23.cpp 36:1 - field
+              type_decl Object1 test23.cpp 44:1 - field
               - isAutogenerated: 1
             integer_cst 64 - parm size
-         field_decl dataptr test23.cpp 37:12 - field
+         field_decl dataptr test23.cpp 45:12 - field
          - unsigned
           integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 39:5
+function_decl __base_ctor  test23.cpp 47:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 47:5 - function result
+ result_decl test23.cpp 55:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 39:24 - argument
+ parm_decl this test23.cpp 47:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 39:20 - argument
+ parm_decl ptr1 test23.cpp 47:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 47:5 - code
+ bind_expr test23.cpp 55:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 40:21 - statement
-    expr_stmt test23.cpp 40:21 - operand
+   cleanup_point_expr test23.cpp 48:21 - statement
+    expr_stmt test23.cpp 48:21 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 40:21 - operand
+       component_ref test23.cpp 48:21 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl this test23.cpp 39:24 - operand
+          parm_decl this test23.cpp 47:24 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Object1 test23.cpp 35:7 - type name
+             type_decl Object1 test23.cpp 43:7 - type name
              - isAutogenerated: 1
-             field_decl dataptr test23.cpp 37:12 - field
+             field_decl dataptr test23.cpp 45:12 - field
              - unsigned
               integer_cst 64 - decl size
-             type_decl Object1 test23.cpp 36:1 - field
+             type_decl Object1 test23.cpp 44:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl dataptr test23.cpp 37:12 - field
+        field_decl dataptr test23.cpp 45:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 39:20 - operand
+       parm_decl ptr1 test23.cpp 47:20 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cond_expr test23.cpp 42:9 - statement
+   cond_expr test23.cpp 50:9 - statement
     ne_expr - operand
-     component_ref test23.cpp 42:13 - operand
+     component_ref test23.cpp 50:13 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 39:24 - operand
+        parm_decl this test23.cpp 47:24 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 35:7 - type name
+           type_decl Object1 test23.cpp 43:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 37:12 - field
+           field_decl dataptr test23.cpp 45:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 36:1 - field
+           type_decl Object1 test23.cpp 44:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 37:12 - field
+      field_decl dataptr test23.cpp 45:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    cleanup_point_expr test23.cpp 44:27 - operand
-     expr_stmt test23.cpp 44:27 - operand
+    cleanup_point_expr test23.cpp 52:27 - operand
+     expr_stmt test23.cpp 52:27 - operand
       convert_expr - expresssion
-       call_expr test23.cpp 44:25 - operand
+       call_expr test23.cpp 52:25 - operand
         addr_expr - function
-         function_decl ftest1 test23.cpp 22:9 - operand
+         function_decl ftest1 test23.cpp 26:9 - operand
          - isExternal: 1
          - isPublic: 1
           method_type - function type
         non_lvalue_expr - arg
          - isUsed: 1
-         parm_decl ptr1 test23.cpp 39:20 - operand
+         parm_decl ptr1 test23.cpp 47:20 - operand
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 6:8 - type name
+            type_decl Data1 test23.cpp 10:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 17:9 - field
+            field_decl val test23.cpp 21:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 18:12 - field
+            field_decl ptrval test23.cpp 22:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 19:14 - field
+            field_decl arr test23.cpp 23:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 20:17 - field
+            field_decl str1 test23.cpp 24:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 7:1 - field
+            type_decl Data1 test23.cpp 11:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-    nop_expr test23.cpp 42:9 - operand
+    nop_expr test23.cpp 50:9 - operand
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 46:26 - statement
-    expr_stmt test23.cpp 46:26 - operand
+   cleanup_point_expr test23.cpp 54:26 - statement
+    expr_stmt test23.cpp 54:26 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 46:24 - operand
+      call_expr test23.cpp 54:24 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        non_lvalue_expr - arg
-        component_ref test23.cpp 46:9 - operand
+        component_ref test23.cpp 54:9 - operand
          indirect_ref - object
           nop_expr - ref
            - isUsed: 1
-           parm_decl this test23.cpp 39:24 - operand
+           parm_decl this test23.cpp 47:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
-              type_decl Object1 test23.cpp 35:7 - type name
+              type_decl Object1 test23.cpp 43:7 - type name
               - isAutogenerated: 1
-              field_decl dataptr test23.cpp 37:12 - field
+              field_decl dataptr test23.cpp 45:12 - field
               - unsigned
                integer_cst 64 - decl size
-              type_decl Object1 test23.cpp 36:1 - field
+              type_decl Object1 test23.cpp 44:1 - field
               - isAutogenerated: 1
             integer_cst 64 - parm size
-         field_decl dataptr test23.cpp 37:12 - field
+         field_decl dataptr test23.cpp 45:12 - field
          - unsigned
           integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 39:5
+function_decl __comp_ctor  test23.cpp 47:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 47:5 - function result
+ result_decl test23.cpp 55:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 39:24 - argument
+ parm_decl this test23.cpp 47:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 39:20 - argument
+ parm_decl ptr1 test23.cpp 47:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl func1 test23.cpp 49:10
+function_decl func1 test23.cpp 57:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 50:5 - function result
+ result_decl test23.cpp 58:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 49:33 - argument
+ parm_decl this test23.cpp 57:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 49:29 - argument
+ parm_decl ptr1 test23.cpp 57:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 51:23 - statement
-   expr_stmt test23.cpp 51:23 - operand
+  cleanup_point_expr test23.cpp 59:23 - statement
+   expr_stmt test23.cpp 59:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 51:9 - operand
+      component_ref test23.cpp 59:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 49:33 - operand
+         parm_decl this test23.cpp 57:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 35:7 - type name
+            type_decl Object1 test23.cpp 43:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 37:12 - field
+            field_decl dataptr test23.cpp 45:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 36:1 - field
+            type_decl Object1 test23.cpp 44:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 37:12 - field
+       field_decl dataptr test23.cpp 45:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 49:29 - operand
+       parm_decl ptr1 test23.cpp 57:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 52:9 - statement
+  if_stmt test23.cpp 60:9 - statement
    ne_expr - condition
-    component_ref test23.cpp 52:13 - operand
+    component_ref test23.cpp 60:13 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 49:33 - operand
+       parm_decl this test23.cpp 57:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
-          type_decl Object1 test23.cpp 35:7 - type name
+          type_decl Object1 test23.cpp 43:7 - type name
           - isAutogenerated: 1
-          field_decl dataptr test23.cpp 37:12 - field
+          field_decl dataptr test23.cpp 45:12 - field
           - unsigned
            integer_cst 64 - decl size
-          type_decl Object1 test23.cpp 36:1 - field
+          type_decl Object1 test23.cpp 44:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 54:27 - then
-    expr_stmt test23.cpp 54:27 - operand
+   cleanup_point_expr test23.cpp 62:27 - then
+    expr_stmt test23.cpp 62:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 54:25 - operand
+      call_expr test23.cpp 62:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 49:29 - operand
+        parm_decl ptr1 test23.cpp 57:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 6:8 - type name
+           type_decl Data1 test23.cpp 10:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 17:9 - field
+           field_decl val test23.cpp 21:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 18:12 - field
+           field_decl ptrval test23.cpp 22:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 19:14 - field
+           field_decl arr test23.cpp 23:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 20:17 - field
+           field_decl str1 test23.cpp 24:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 7:1 - field
+           type_decl Data1 test23.cpp 11:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func2 test23.cpp 58:10
+function_decl func2 test23.cpp 66:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 59:5 - function result
+ result_decl test23.cpp 67:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 58:33 - argument
+ parm_decl this test23.cpp 66:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 58:29 - argument
+ parm_decl ptr1 test23.cpp 66:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 60:23 - statement
-   expr_stmt test23.cpp 60:23 - operand
+  cleanup_point_expr test23.cpp 68:23 - statement
+   expr_stmt test23.cpp 68:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 60:9 - operand
+      component_ref test23.cpp 68:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 58:33 - operand
+         parm_decl this test23.cpp 66:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 35:7 - type name
+            type_decl Object1 test23.cpp 43:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 37:12 - field
+            field_decl dataptr test23.cpp 45:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 36:1 - field
+            type_decl Object1 test23.cpp 44:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 37:12 - field
+       field_decl dataptr test23.cpp 45:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 58:29 - operand
+       parm_decl ptr1 test23.cpp 66:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 61:9 - statement
+  if_stmt test23.cpp 69:9 - statement
    ne_expr - condition
     nop_expr - operand
      - isUsed: 1
-     parm_decl ptr1 test23.cpp 58:29 - operand
+     parm_decl ptr1 test23.cpp 66:29 - operand
       pointer_type - decl type
        record_type - nested type
-        type_decl Data1 test23.cpp 6:8 - type name
+        type_decl Data1 test23.cpp 10:8 - type name
         - isAutogenerated: 1
-        field_decl val test23.cpp 17:9 - field
+        field_decl val test23.cpp 21:9 - field
         - signed
          integer_cst 32 - decl size
-        field_decl ptrval test23.cpp 18:12 - field
+        field_decl ptrval test23.cpp 22:12 - field
         - unsigned
          integer_cst 64 - decl size
-        field_decl arr test23.cpp 19:14 - field
+        field_decl arr test23.cpp 23:14 - field
         - signed
          integer_cst 96 - decl size
-        field_decl str1 test23.cpp 20:17 - field
+        field_decl str1 test23.cpp 24:17 - field
         - signed
          integer_cst 64 - decl size
-        type_decl Data1 test23.cpp 7:1 - field
+        type_decl Data1 test23.cpp 11:1 - field
         - isAutogenerated: 1
       integer_cst 64 - parm size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 63:27 - then
-    expr_stmt test23.cpp 63:27 - operand
+   cleanup_point_expr test23.cpp 71:27 - then
+    expr_stmt test23.cpp 71:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 63:25 - operand
+      call_expr test23.cpp 71:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 58:29 - operand
+        parm_decl ptr1 test23.cpp 66:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 6:8 - type name
+           type_decl Data1 test23.cpp 10:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 17:9 - field
+           field_decl val test23.cpp 21:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 18:12 - field
+           field_decl ptrval test23.cpp 22:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 19:14 - field
+           field_decl arr test23.cpp 23:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 20:17 - field
+           field_decl str1 test23.cpp 24:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 7:1 - field
+           type_decl Data1 test23.cpp 11:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func3 test23.cpp 67:10
+function_decl func3 test23.cpp 75:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 68:5 - function result
+ result_decl test23.cpp 76:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 67:33 - argument
+ parm_decl this test23.cpp 75:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 67:29 - argument
+ parm_decl ptr1 test23.cpp 75:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 69:23 - statement
-   expr_stmt test23.cpp 69:23 - operand
+  cleanup_point_expr test23.cpp 77:23 - statement
+   expr_stmt test23.cpp 77:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 69:9 - operand
+      component_ref test23.cpp 77:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 67:33 - operand
+         parm_decl this test23.cpp 75:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 35:7 - type name
+            type_decl Object1 test23.cpp 43:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 37:12 - field
+            field_decl dataptr test23.cpp 45:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 36:1 - field
+            type_decl Object1 test23.cpp 44:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 37:12 - field
+       field_decl dataptr test23.cpp 45:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 67:29 - operand
+       parm_decl ptr1 test23.cpp 75:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 70:9 - statement
-   eq_expr test23.cpp 70:14 - condition
-    component_ref test23.cpp 70:14 - operand
+  if_stmt test23.cpp 78:9 - statement
+   eq_expr test23.cpp 78:14 - condition
+    component_ref test23.cpp 78:14 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 67:33 - operand
+       parm_decl this test23.cpp 75:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
-          type_decl Object1 test23.cpp 35:7 - type name
+          type_decl Object1 test23.cpp 43:7 - type name
           - isAutogenerated: 1
-          field_decl dataptr test23.cpp 37:12 - field
+          field_decl dataptr test23.cpp 45:12 - field
           - unsigned
            integer_cst 64 - decl size
-          type_decl Object1 test23.cpp 36:1 - field
+          type_decl Object1 test23.cpp 44:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 72:27 - then
-    expr_stmt test23.cpp 72:27 - operand
+   cleanup_point_expr test23.cpp 80:27 - then
+    expr_stmt test23.cpp 80:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 72:25 - operand
+      call_expr test23.cpp 80:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 67:29 - operand
+        parm_decl ptr1 test23.cpp 75:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 6:8 - type name
+           type_decl Data1 test23.cpp 10:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 17:9 - field
+           field_decl val test23.cpp 21:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 18:12 - field
+           field_decl ptrval test23.cpp 22:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 19:14 - field
+           field_decl arr test23.cpp 23:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 20:17 - field
+           field_decl str1 test23.cpp 24:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 7:1 - field
+           type_decl Data1 test23.cpp 11:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func4 test23.cpp 76:10
+function_decl func4 test23.cpp 84:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 77:5 - function result
+ result_decl test23.cpp 85:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 76:33 - argument
+ parm_decl this test23.cpp 84:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 76:29 - argument
+ parm_decl ptr1 test23.cpp 84:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 78:23 - statement
-   expr_stmt test23.cpp 78:23 - operand
+  cleanup_point_expr test23.cpp 86:23 - statement
+   expr_stmt test23.cpp 86:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 78:9 - operand
+      component_ref test23.cpp 86:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 76:33 - operand
+         parm_decl this test23.cpp 84:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 35:7 - type name
+            type_decl Object1 test23.cpp 43:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 37:12 - field
+            field_decl dataptr test23.cpp 45:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 36:1 - field
+            type_decl Object1 test23.cpp 44:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 37:12 - field
+       field_decl dataptr test23.cpp 45:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 76:29 - operand
+       parm_decl ptr1 test23.cpp 84:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 79:9 - statement
-   truth_andif_expr test23.cpp 79:22 - condition
-    eq_expr test23.cpp 79:14 - operand
-     component_ref test23.cpp 79:14 - operand
+  if_stmt test23.cpp 87:9 - statement
+   truth_andif_expr test23.cpp 87:22 - condition
+    eq_expr test23.cpp 87:14 - operand
+     component_ref test23.cpp 87:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 76:33 - operand
+        parm_decl this test23.cpp 84:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 35:7 - type name
+           type_decl Object1 test23.cpp 43:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 37:12 - field
+           field_decl dataptr test23.cpp 45:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 36:1 - field
+           type_decl Object1 test23.cpp 44:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 37:12 - field
+      field_decl dataptr test23.cpp 45:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
     ne_expr - operand
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 76:29 - operand
+      parm_decl ptr1 test23.cpp 84:29 - operand
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 6:8 - type name
+         type_decl Data1 test23.cpp 10:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 17:9 - field
+         field_decl val test23.cpp 21:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 18:12 - field
+         field_decl ptrval test23.cpp 22:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 19:14 - field
+         field_decl arr test23.cpp 23:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 20:17 - field
+         field_decl str1 test23.cpp 24:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 7:1 - field
+         type_decl Data1 test23.cpp 11:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 81:27 - then
-    expr_stmt test23.cpp 81:27 - operand
+   cleanup_point_expr test23.cpp 89:27 - then
+    expr_stmt test23.cpp 89:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 81:25 - operand
+      call_expr test23.cpp 89:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 76:29 - operand
+        parm_decl ptr1 test23.cpp 84:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 6:8 - type name
+           type_decl Data1 test23.cpp 10:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 17:9 - field
+           field_decl val test23.cpp 21:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 18:12 - field
+           field_decl ptrval test23.cpp 22:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 19:14 - field
+           field_decl arr test23.cpp 23:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 20:17 - field
+           field_decl str1 test23.cpp 24:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 7:1 - field
+           type_decl Data1 test23.cpp 11:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func5 test23.cpp 85:10
+function_decl func5 test23.cpp 93:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test23.cpp 35:7 - type name
+   type_decl Object1 test23.cpp 43:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 37:12 - field
+   field_decl dataptr test23.cpp 45:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 36:1 - field
+   type_decl Object1 test23.cpp 44:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 35:7 - type name
+     type_decl Object1 test23.cpp 43:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 37:12 - field
+     field_decl dataptr test23.cpp 45:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 36:1 - field
+     type_decl Object1 test23.cpp 44:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 6:8 - type name
+      type_decl Data1 test23.cpp 10:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 17:9 - field
+      field_decl val test23.cpp 21:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 18:12 - field
+      field_decl ptrval test23.cpp 22:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 19:14 - field
+      field_decl arr test23.cpp 23:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 20:17 - field
+      field_decl str1 test23.cpp 24:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 7:1 - field
+      type_decl Data1 test23.cpp 11:1 - field
       - isAutogenerated: 1
     tree_list - chain
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 86:5 - function result
+ result_decl test23.cpp 94:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 85:33 - argument
+ parm_decl this test23.cpp 93:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 35:7 - type name
+    type_decl Object1 test23.cpp 43:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 37:12 - field
+    field_decl dataptr test23.cpp 45:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 36:1 - field
+    type_decl Object1 test23.cpp 44:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 85:29 - argument
+ parm_decl ptr1 test23.cpp 93:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 6:8 - type name
+    type_decl Data1 test23.cpp 10:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 17:9 - field
+    field_decl val test23.cpp 21:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 18:12 - field
+    field_decl ptrval test23.cpp 22:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 19:14 - field
+    field_decl arr test23.cpp 23:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 20:17 - field
+    field_decl str1 test23.cpp 24:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 7:1 - field
+    type_decl Data1 test23.cpp 11:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 87:23 - statement
-   expr_stmt test23.cpp 87:23 - operand
+  cleanup_point_expr test23.cpp 95:23 - statement
+   expr_stmt test23.cpp 95:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 87:9 - operand
+      component_ref test23.cpp 95:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 85:33 - operand
+         parm_decl this test23.cpp 93:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 35:7 - type name
+            type_decl Object1 test23.cpp 43:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 37:12 - field
+            field_decl dataptr test23.cpp 45:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 36:1 - field
+            type_decl Object1 test23.cpp 44:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 37:12 - field
+       field_decl dataptr test23.cpp 45:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 85:29 - operand
+       parm_decl ptr1 test23.cpp 93:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 6:8 - type name
+          type_decl Data1 test23.cpp 10:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 17:9 - field
+          field_decl val test23.cpp 21:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 18:12 - field
+          field_decl ptrval test23.cpp 22:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 19:14 - field
+          field_decl arr test23.cpp 23:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 20:17 - field
+          field_decl str1 test23.cpp 24:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 7:1 - field
+          type_decl Data1 test23.cpp 11:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 88:9 - statement
-   truth_orif_expr test23.cpp 88:22 - condition
-    eq_expr test23.cpp 88:14 - operand
-     component_ref test23.cpp 88:14 - operand
+  if_stmt test23.cpp 96:9 - statement
+   truth_orif_expr test23.cpp 96:22 - condition
+    eq_expr test23.cpp 96:14 - operand
+     component_ref test23.cpp 96:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 85:33 - operand
+        parm_decl this test23.cpp 93:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 35:7 - type name
+           type_decl Object1 test23.cpp 43:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 37:12 - field
+           field_decl dataptr test23.cpp 45:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 36:1 - field
+           type_decl Object1 test23.cpp 44:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 37:12 - field
+      field_decl dataptr test23.cpp 45:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    eq_expr test23.cpp 88:26 - operand
+    eq_expr test23.cpp 96:26 - operand
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 85:29 - operand
+      parm_decl ptr1 test23.cpp 93:29 - operand
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 6:8 - type name
+         type_decl Data1 test23.cpp 10:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 17:9 - field
+         field_decl val test23.cpp 21:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 18:12 - field
+         field_decl ptrval test23.cpp 22:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 19:14 - field
+         field_decl arr test23.cpp 23:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 20:17 - field
+         field_decl str1 test23.cpp 24:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 7:1 - field
+         type_decl Data1 test23.cpp 11:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 90:27 - then
-    expr_stmt test23.cpp 90:27 - operand
+   cleanup_point_expr test23.cpp 98:27 - then
+    expr_stmt test23.cpp 98:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 90:25 - operand
+      call_expr test23.cpp 98:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 22:9 - operand
+        function_decl ftest1 test23.cpp 26:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 85:29 - operand
+        parm_decl ptr1 test23.cpp 93:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 6:8 - type name
+           type_decl Data1 test23.cpp 10:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 17:9 - field
+           field_decl val test23.cpp 21:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 18:12 - field
+           field_decl ptrval test23.cpp 22:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 19:14 - field
+           field_decl arr test23.cpp 23:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 20:17 - field
+           field_decl str1 test23.cpp 24:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 7:1 - field
+           type_decl Data1 test23.cpp 11:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
+function_decl func6 test23.cpp 102:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 43:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 45:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 44:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 43:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 45:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 44:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     type_decl FuncPtr1 test23.cpp 6:16 - type name
+     function_type - nested type
+      void_type - function return type
+       type_decl void <built-in> 0:0 - type name
+       - isAutogenerated: 1
+      tree_list - arg types
+       void_type - value
+        type_decl void <built-in> 0:0 - type name
+        - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 103:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test23.cpp 102:29 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 43:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 45:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 44:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 102:25 - argument
+  pointer_type - decl type
+   type_decl FuncPtr1 test23.cpp 6:16 - type name
+   function_type - nested type
+    void_type - function return type
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+    tree_list - arg types
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+  integer_cst 64 - parm size
+ cleanup_point_expr test23.cpp 104:15 - code
+  expr_stmt test23.cpp 104:15 - operand
+   call_expr test23.cpp 104:13 - expresssion
+    - isUsed: 1
+    parm_decl ptr1 test23.cpp 102:25 - function
+     pointer_type - decl type
+      type_decl FuncPtr1 test23.cpp 6:16 - type name
+      function_type - nested type
+       void_type - function return type
+        type_decl void <built-in> 0:0 - type name
+        - isAutogenerated: 1
+       tree_list - arg types
+        void_type - value
+         type_decl void <built-in> 0:0 - type name
+         - isAutogenerated: 1
+     integer_cst 64 - parm size
+function_decl func7 test23.cpp 107:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 43:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 45:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 44:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 43:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 45:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 44:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 10:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 21:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 22:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 23:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 24:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 11:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 108:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test23.cpp 107:27 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 43:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 45:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 44:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 107:23 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 10:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 21:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 22:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 23:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 24:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 11:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test23.cpp 110:20 - code
+  var_decl fptr2 test23.cpp 109:18 - operand
+  - isUsed: 1
+   integer_cst 64 - decl size
+   pointer_type - var type
+    type_decl FuncPtr2 test23.cpp 7:16 - type name
+    function_type - nested type
+     void_type - function return type
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+     tree_list - arg types
+      pointer_type - value
+       record_type - nested type
+        type_decl Data1 test23.cpp 10:8 - type name
+        - isAutogenerated: 1
+        field_decl val test23.cpp 21:9 - field
+        - signed
+         integer_cst 32 - decl size
+        field_decl ptrval test23.cpp 22:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        field_decl arr test23.cpp 23:14 - field
+        - signed
+         integer_cst 96 - decl size
+        field_decl str1 test23.cpp 24:17 - field
+        - signed
+         integer_cst 64 - decl size
+        type_decl Data1 test23.cpp 11:1 - field
+        - isAutogenerated: 1
+      tree_list - chain
+       void_type - value
+        type_decl void <built-in> 0:0 - type name
+        - isAutogenerated: 1
+  statement_list - operand
+   decl_expr test23.cpp 109:18 - statement
+    var_decl fptr2 test23.cpp 109:18 - operand
+    - isUsed: 1
+   cleanup_point_expr test23.cpp 110:20 - statement
+    expr_stmt test23.cpp 110:20 - operand
+     call_expr test23.cpp 110:14 - expresssion
+      var_decl fptr2 test23.cpp 109:18 - function
+      - isUsed: 1
+      - isUsed: 1
+      parm_decl ptr1 test23.cpp 107:23 - arg
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test23.cpp 10:8 - type name
+         - isAutogenerated: 1
+         field_decl val test23.cpp 21:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test23.cpp 22:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         field_decl arr test23.cpp 23:14 - field
+         - signed
+          integer_cst 96 - decl size
+         field_decl str1 test23.cpp 24:17 - field
+         - signed
+          integer_cst 64 - decl size
+         type_decl Data1 test23.cpp 11:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+  block - operand
+   var_decl fptr2 test23.cpp 109:18 - block vars
+   - isUsed: 1
+function_decl func8 test23.cpp 113:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 43:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 45:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 44:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 43:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 45:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 44:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 10:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 21:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 22:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 23:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 24:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 11:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 114:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test23.cpp 113:27 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 43:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 45:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 44:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 113:23 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 10:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 21:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 22:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 23:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 24:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 11:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test23.cpp 116:29 - code
+  var_decl fptr2 test23.cpp 115:18 - operand
+  - isUsed: 1
+   integer_cst 128 - decl size
+   constructor - initial
+    record_type - constructor type
+     field_decl __pfn test23.cpp 8:44 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl __delta test23.cpp 8:44 - field
+     - signed
+      integer_cst 64 - decl size
+    field_decl __pfn test23.cpp 8:44 - index
+    - unsigned
+     integer_cst 64 - decl size
+    addr_expr - value
+     function_decl ftest3 test23.cpp 36:10 - operand
+     - isExternal: 1
+     - isPublic: 1
+      method_type - function type
+    field_decl __delta test23.cpp 8:44 - index
+    - signed
+     integer_cst 64 - decl size
+    integer_cst 0 - value
+   record_type - var type
+    type_decl FuncPtr3 test23.cpp 8:44 - type name
+    field_decl __pfn test23.cpp 8:44 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl __delta test23.cpp 8:44 - field
+    - signed
+     integer_cst 64 - decl size
+  statement_list - operand
+   cleanup_point_expr test23.cpp 115:34 - statement
+    decl_expr test23.cpp 115:34 - operand
+     var_decl fptr2 test23.cpp 115:18 - operand
+     - isUsed: 1
+   cleanup_point_expr test23.cpp 116:29 - statement
+    expr_stmt test23.cpp 116:29 - operand
+     call_expr test23.cpp 116:23 - expresssion
+      cond_expr - function
+       eq_expr - operand
+        bit_and_expr - operand
+         nop_expr - operand
+          component_ref test23.cpp 116:28 - operand
+           var_decl fptr2 test23.cpp 115:18 - object
+           - isUsed: 1
+           field_decl __pfn test23.cpp 8:44 - field
+           - unsigned
+            integer_cst 64 - decl size
+         integer_cst 1 - operand
+        integer_cst 0 - operand
+       component_ref test23.cpp 116:28 - operand
+        var_decl fptr2 test23.cpp 115:18 - object
+        - isUsed: 1
+        field_decl __pfn test23.cpp 8:44 - field
+        - unsigned
+         integer_cst 64 - decl size
+       nop_expr - operand
+        indirect_ref - operand
+         pointer_plus_expr test23.cpp 116:28 - ref
+          indirect_ref - operand
+           nop_expr - ref
+            pointer_plus_expr - operand
+             non_lvalue_expr - operand
+              - isUsed: 1
+              parm_decl ptr1 test23.cpp 113:23 - operand
+               pointer_type - decl type
+                record_type - nested type
+                 type_decl Data1 test23.cpp 10:8 - type name
+                 - isAutogenerated: 1
+                 field_decl val test23.cpp 21:9 - field
+                 - signed
+                  integer_cst 32 - decl size
+                 field_decl ptrval test23.cpp 22:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 field_decl arr test23.cpp 23:14 - field
+                 - signed
+                  integer_cst 96 - decl size
+                 field_decl str1 test23.cpp 24:17 - field
+                 - signed
+                  integer_cst 64 - decl size
+                 type_decl Data1 test23.cpp 11:1 - field
+                 - isAutogenerated: 1
+               integer_cst 64 - parm size
+             nop_expr - operand
+              component_ref test23.cpp 116:28 - operand
+               var_decl fptr2 test23.cpp 115:18 - object
+               - isUsed: 1
+               field_decl __delta test23.cpp 8:44 - field
+               - signed
+                integer_cst 64 - decl size
+          nop_expr test23.cpp 116:28 - operand
+           plus_expr - operand
+            nop_expr - operand
+             component_ref test23.cpp 116:28 - operand
+              var_decl fptr2 test23.cpp 115:18 - object
+              - isUsed: 1
+              field_decl __pfn test23.cpp 8:44 - field
+              - unsigned
+               integer_cst 64 - decl size
+            integer_cst -1 - operand
+      pointer_plus_expr - arg
+       non_lvalue_expr - operand
+        - isUsed: 1
+        parm_decl ptr1 test23.cpp 113:23 - operand
+         pointer_type - decl type
+          record_type - nested type
+           type_decl Data1 test23.cpp 10:8 - type name
+           - isAutogenerated: 1
+           field_decl val test23.cpp 21:9 - field
+           - signed
+            integer_cst 32 - decl size
+           field_decl ptrval test23.cpp 22:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           field_decl arr test23.cpp 23:14 - field
+           - signed
+            integer_cst 96 - decl size
+           field_decl str1 test23.cpp 24:17 - field
+           - signed
+            integer_cst 64 - decl size
+           type_decl Data1 test23.cpp 11:1 - field
+           - isAutogenerated: 1
+         integer_cst 64 - parm size
+       nop_expr - operand
+        component_ref test23.cpp 116:28 - operand
+         var_decl fptr2 test23.cpp 115:18 - object
+         - isUsed: 1
+         field_decl __delta test23.cpp 8:44 - field
+         - signed
+          integer_cst 64 - decl size
+      - isUsed: 1
+      parm_decl ptr1 test23.cpp 113:23 - arg
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test23.cpp 10:8 - type name
+         - isAutogenerated: 1
+         field_decl val test23.cpp 21:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test23.cpp 22:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         field_decl arr test23.cpp 23:14 - field
+         - signed
+          integer_cst 96 - decl size
+         field_decl str1 test23.cpp 24:17 - field
+         - signed
+          integer_cst 64 - decl size
+         type_decl Data1 test23.cpp 11:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+  block - operand
+   var_decl fptr2 test23.cpp 115:18 - block vars
+   - isUsed: 1
 function_decl fill /usr/include/c++/5/bits/stl_algobase.h 736:5
 - isPublic: 1
  function_type - function type
diff --git a/test/test23-02.txt b/test/test23-02.txt
index 62fead7..831dbd1 100644
--- a/test/test23-02.txt
+++ b/test/test23-02.txt
@@ -218,40 +218,48 @@ __base_ctor : pointer_type ptr0,
 __comp_ctor : pointer_type ptr0, 
 ftest1: 
 ftest2: pointer_type ptr0, 
+ftest3: pointer_type ptr0, 
 Object1: pointer_type ptr1, 
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:44:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:52:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 __base_ctor : pointer_type ptr1, 
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:44:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:52:25: warning: Using parameter 'ptr1' without checking for null pointer
 __comp_ctor : pointer_type ptr1, 
 func1: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func1(Data1*)':
-test23.cpp:54:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:62:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func2: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func2(Data1*)':
-test23.cpp:63:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:71:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func3: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func4: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func4(Data1*)':
-test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:89:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func5: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
+func6: pointer_type ptr1, 
+test23.cpp: In member function 'void Object1::func6(FuncPtr1)':
+test23.cpp:104:13: warning: Using parameter 'ptr1' without checking for null pointer
+         ptr1();
+             ^
+func7: pointer_type ptr1, 
+func8: pointer_type ptr1, 
 fill: pointer_type __first, pointer_type __last, 
 _Alloc_hider: 
 __base_dtor : 
diff --git a/test/test23-03.txt b/test/test23-03.txt
index d3db60a..06fd6ce 100644
--- a/test/test23-03.txt
+++ b/test/test23-03.txt
@@ -2555,6 +2555,8 @@ integer_cst -2147483648: ptr0,
 integer_cst 2147483647: ptr0, 
 integer_cst 32: ptr0, 
 integer_cst 1: ptr0, 
+function_decl ftest3: 
+statement_list : ptr0, 
 function_decl Object1: 
 bind_expr : ptr1, 
 statement_list : ptr1, 
@@ -2630,7 +2632,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 component_ref : ptr1, this->dataptr, 
@@ -2722,7 +2724,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
 component_ref : ptr1, this->dataptr, 
 indirect_ref : ptr1, this->dataptr, 
 parm_decl this: ptr1, this->dataptr, 
@@ -2928,7 +2930,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
@@ -3100,7 +3102,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
@@ -3117,6 +3119,185 @@ field_decl str1: ptr1, this->dataptr,
 integer_cst 64: ptr1, this->dataptr, 
 type_decl Data1: ptr1, this->dataptr, 
 integer_cst 64: ptr1, this->dataptr, 
+function_decl func6: 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+type_decl FuncPtr1: ptr1, 
+function_type : ptr1, 
+void_type : ptr1, 
+type_decl void: ptr1, 
+tree_list : ptr1, 
+void_type : ptr1, 
+type_decl void: ptr1, 
+integer_cst 64: ptr1, 
+test23.cpp: In member function 'void Object1::func6(FuncPtr1)':
+test23.cpp:104:13: warning: Using parameter 'ptr1' without checking for null pointer
+         ptr1();
+             ^
+function_decl func7: 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+decl_expr : ptr1, 
+var_decl fptr2: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+var_decl fptr2: ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+field_decl str1: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+var_decl fptr2: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+type_decl FuncPtr2: ptr1, 
+function_type : ptr1, 
+void_type : ptr1, 
+type_decl void: ptr1, 
+tree_list : ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+field_decl str1: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+tree_list : ptr1, 
+void_type : ptr1, 
+type_decl void: ptr1, 
+block : ptr1, 
+var_decl fptr2: ptr1, 
+function_decl func8: 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+decl_expr : ptr1, 
+var_decl fptr2: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+cond_expr : ptr1, 
+eq_expr : ptr1, 
+bit_and_expr : ptr1, 
+component_ref : ptr1, 
+var_decl fptr2: ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 1: ptr1, 
+integer_cst 0: ptr1, 
+component_ref : ptr1, 
+var_decl fptr2: ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+indirect_ref : ptr1, 
+pointer_plus_expr : ptr1, 
+indirect_ref : ptr1, 
+pointer_plus_expr : ptr1, 
+test23.cpp: In member function 'void Object1::func8(Data1*)':
+test23.cpp:116:28: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                            ^
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+field_decl str1: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+component_ref : ptr1, 
+var_decl fptr2: ptr1, 
+field_decl __delta: ptr1, 
+integer_cst 64: ptr1, 
+plus_expr : ptr1, 
+component_ref : ptr1, 
+var_decl fptr2: ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst -1: ptr1, 
+pointer_plus_expr : ptr1, 
+test23.cpp:116:23: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                       ^
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+field_decl str1: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+component_ref : ptr1, 
+var_decl fptr2: ptr1, 
+field_decl __delta: ptr1, 
+integer_cst 64: ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+field_decl str1: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+var_decl fptr2: ptr1, 
+integer_cst 128: ptr1, 
+constructor : ptr1, 
+record_type : ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+field_decl __delta: ptr1, 
+integer_cst 64: ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+addr_expr : ptr1, 
+function_decl ftest3: ptr1, 
+field_decl __delta: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+record_type : ptr1, 
+type_decl FuncPtr3: ptr1, 
+field_decl __pfn: ptr1, 
+integer_cst 64: ptr1, 
+field_decl __delta: ptr1, 
+integer_cst 64: ptr1, 
+block : ptr1, 
+var_decl fptr2: ptr1, 
 function_decl fill: 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
diff --git a/test/test23-04.txt b/test/test23-04.txt
index bfd3985..4fc5ad5 100644
--- a/test/test23-04.txt
+++ b/test/test23-04.txt
@@ -1,14 +1,25 @@
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
+test23.cpp: In member function 'void Object1::func6(FuncPtr1)':
+test23.cpp:104:13: warning: Using parameter 'ptr1' without checking for null pointer
+         ptr1();
+             ^
+test23.cpp: In member function 'void Object1::func8(Data1*)':
+test23.cpp:116:28: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                            ^
+test23.cpp:116:23: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                       ^
diff --git a/test/test23-05.txt b/test/test23-05.txt
index bfd3985..4fc5ad5 100644
--- a/test/test23-05.txt
+++ b/test/test23-05.txt
@@ -1,14 +1,25 @@
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
+test23.cpp: In member function 'void Object1::func6(FuncPtr1)':
+test23.cpp:104:13: warning: Using parameter 'ptr1' without checking for null pointer
+         ptr1();
+             ^
+test23.cpp: In member function 'void Object1::func8(Data1*)':
+test23.cpp:116:28: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                            ^
+test23.cpp:116:23: warning: Using parameter 'ptr1' without checking for null pointer
+         (ptr1->*fptr2)(ptr1);
+                       ^
diff --git a/test/test23.cpp b/test/test23.cpp
index 6b9771e..bddd1a9 100644
--- a/test/test23.cpp
+++ b/test/test23.cpp
@@ -3,6 +3,10 @@
 
 struct Data1;
 
+typedef void (*FuncPtr1) (void);
+typedef void (*FuncPtr2) (Data1 *ptr);
+typedef void (Data1::*FuncPtr3) (Data1 *ptr);
+
 struct Data1
 {
     Data1()
@@ -28,6 +32,10 @@ struct Data1
     {
         return 1;
     }
+
+    void ftest3(Data1 *ptr0)
+    {
+    }
 };
 
 int k;
@@ -90,4 +98,21 @@ class Object1
             ptr1->ftest1();
         }
     }
+
+    void func6(FuncPtr1 ptr1)
+    {
+        ptr1();
+    }
+
+    void func7(Data1 *ptr1)
+    {
+        FuncPtr2 fptr2;
+        fptr2(ptr1);
+    }
+
+    void func8(Data1 *ptr1)
+    {
+        FuncPtr3 fptr2 = &Data1::ftest3;
+        (ptr1->*fptr2)(ptr1);
+    }
 };