Update test 23.

6 files changed, 1210 insertions, 1007 deletions

diff --git a/test/test23-01.txt b/test/test23-01.txt
index f1ebb96..431caf9 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 12:5
+function_decl Data1 test23.cpp 13: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12: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 13: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 12:11 - argument
+ parm_decl this test23.cpp 13:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 14:5 - code
+ bind_expr test23.cpp 15:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 13:5 - statement
-    expr_stmt test23.cpp 13:5 - operand
-     call_expr test23.cpp 13:5 - expresssion
+   cleanup_point_expr test23.cpp 14:5 - statement
+    expr_stmt test23.cpp 14:5 - operand
+     call_expr test23.cpp 14: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 13:5 - operand
+       component_ref test23.cpp 14:5 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:11 - operand
+          parm_decl this test23.cpp 13:11 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-   cleanup_stmt test23.cpp 13:5 - statement
+   cleanup_stmt test23.cpp 14:5 - statement
     statement_list - body
-    call_expr test23.cpp 13:5 - expresssion
+    call_expr test23.cpp 14: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 13:5 - operand
+      component_ref test23.cpp 14:5 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 12:11 - operand
+         parm_decl this test23.cpp 13:11 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 24:17 - field
+       field_decl str1 test23.cpp 25:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 12:5
+function_decl __base_ctor  test23.cpp 13: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12: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 14:5 - function result
+ result_decl test23.cpp 15: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:11 - argument
+ parm_decl this test23.cpp 13:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 14:5 - code
+ bind_expr test23.cpp 15:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 13:5 - statement
-    expr_stmt test23.cpp 13:5 - operand
-     call_expr test23.cpp 13:5 - expresssion
+   cleanup_point_expr test23.cpp 14:5 - statement
+    expr_stmt test23.cpp 14:5 - operand
+     call_expr test23.cpp 14: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 13:5 - operand
+       component_ref test23.cpp 14:5 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 12:11 - operand
+          parm_decl this test23.cpp 13:11 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-   try_catch_expr test23.cpp 13:5 - statement
+   try_catch_expr test23.cpp 14:5 - statement
     statement_list - operand
-    call_expr test23.cpp 13:5 - operand
+    call_expr test23.cpp 14: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 13:5 - operand
+      component_ref test23.cpp 14:5 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 12:11 - operand
+         parm_decl this test23.cpp 13:11 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 24:17 - field
+       field_decl str1 test23.cpp 25:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 12:5
+function_decl __comp_ctor  test23.cpp 13: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12: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 14:5 - function result
+ result_decl test23.cpp 15: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:11 - argument
+ parm_decl this test23.cpp 13:11 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl Data1 test23.cpp 16:5
+function_decl Data1 test23.cpp 17: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 16:24 - function result
+ result_decl test23.cpp 17: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 16:22 - argument
+ parm_decl this test23.cpp 17:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 16:18 - argument
+ parm_decl ptr0 test23.cpp 17:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 19:5 - code
+ bind_expr test23.cpp 20:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 17:20 - statement
-    expr_stmt test23.cpp 17:20 - operand
+   cleanup_point_expr test23.cpp 18:20 - statement
+    expr_stmt test23.cpp 18:20 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 17:20 - operand
+       component_ref test23.cpp 18:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 16:22 - operand
+          parm_decl this test23.cpp 17:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl ptrval test23.cpp 22:12 - field
+        field_decl ptrval test23.cpp 23:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr0 test23.cpp 16:18 - operand
+       parm_decl ptr0 test23.cpp 17:18 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 17:20 - statement
-    expr_stmt test23.cpp 17:20 - operand
-     call_expr test23.cpp 17:20 - expresssion
+   cleanup_point_expr test23.cpp 18:20 - statement
+    expr_stmt test23.cpp 18:20 - operand
+     call_expr test23.cpp 18: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 17:20 - operand
+       component_ref test23.cpp 18:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 16:22 - operand
+          parm_decl this test23.cpp 17:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-   cleanup_stmt test23.cpp 17:20 - statement
+   cleanup_stmt test23.cpp 18:20 - statement
     statement_list - body
-    call_expr test23.cpp 17:20 - expresssion
+    call_expr test23.cpp 18: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 17:20 - operand
+      component_ref test23.cpp 18:20 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 16:22 - operand
+         parm_decl this test23.cpp 17:22 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 24:17 - field
+       field_decl str1 test23.cpp 25:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 16:5
+function_decl __base_ctor  test23.cpp 17: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 19:5 - function result
+ result_decl test23.cpp 20: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 16:22 - argument
+ parm_decl this test23.cpp 17:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 16:18 - argument
+ parm_decl ptr0 test23.cpp 17:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 19:5 - code
+ bind_expr test23.cpp 20:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 17:20 - statement
-    expr_stmt test23.cpp 17:20 - operand
+   cleanup_point_expr test23.cpp 18:20 - statement
+    expr_stmt test23.cpp 18:20 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 17:20 - operand
+       component_ref test23.cpp 18:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 16:22 - operand
+          parm_decl this test23.cpp 17:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl ptrval test23.cpp 22:12 - field
+        field_decl ptrval test23.cpp 23:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr0 test23.cpp 16:18 - operand
+       parm_decl ptr0 test23.cpp 17:18 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 17:20 - statement
-    expr_stmt test23.cpp 17:20 - operand
-     call_expr test23.cpp 17:20 - expresssion
+   cleanup_point_expr test23.cpp 18:20 - statement
+    expr_stmt test23.cpp 18:20 - operand
+     call_expr test23.cpp 18: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 17:20 - operand
+       component_ref test23.cpp 18:20 - operand
         indirect_ref - object
          nop_expr - ref
-          parm_decl this test23.cpp 16:22 - operand
+          parm_decl this test23.cpp 17:22 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test23.cpp 10:8 - type name
+             type_decl Data1 test23.cpp 11:8 - type name
              - isAutogenerated: 1
-             field_decl val test23.cpp 21:9 - field
+             field_decl val test23.cpp 22:9 - field
              - signed
               integer_cst 32 - decl size
-             field_decl ptrval test23.cpp 22:12 - field
+             field_decl ptrval test23.cpp 23:12 - field
              - unsigned
               integer_cst 64 - decl size
-             field_decl arr test23.cpp 23:14 - field
+             field_decl arr test23.cpp 24:14 - field
              - signed
               integer_cst 96 - decl size
-             field_decl str1 test23.cpp 24:17 - field
+             field_decl str1 test23.cpp 25:17 - field
              - signed
               integer_cst 64 - decl size
-             type_decl Data1 test23.cpp 11:1 - field
+             type_decl Data1 test23.cpp 12:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-   try_catch_expr test23.cpp 17:20 - statement
+   try_catch_expr test23.cpp 18:20 - statement
     statement_list - operand
-    call_expr test23.cpp 17:20 - operand
+    call_expr test23.cpp 18: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 17:20 - operand
+      component_ref test23.cpp 18:20 - operand
        indirect_ref - object
         nop_expr - ref
-         parm_decl this test23.cpp 16:22 - operand
+         parm_decl this test23.cpp 17:22 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl str1 test23.cpp 24:17 - field
+       field_decl str1 test23.cpp 25:17 - field
        - signed
         integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 16:5
+function_decl __comp_ctor  test23.cpp 17: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 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 19:5 - function result
+ result_decl test23.cpp 20: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 16:22 - argument
+ parm_decl this test23.cpp 17:22 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr0 test23.cpp 16:18 - argument
+ parm_decl ptr0 test23.cpp 17:18 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl ftest1 test23.cpp 26:9
+function_decl ftest1 test23.cpp 27:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -22858,46 +22858,46 @@ function_decl ftest1 test23.cpp 26:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Data1 test23.cpp 10:8 - type name
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12: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 27:5 - function result
+ result_decl test23.cpp 28:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -22908,30 +22908,30 @@ function_decl ftest1 test23.cpp 26:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test23.cpp 26:16 - argument
+ parm_decl this test23.cpp 27:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test23.cpp 28:16 - code
+ return_expr test23.cpp 29:16 - code
   init_expr - operand
-   result_decl test23.cpp 27:5 - operand
+   result_decl test23.cpp 28:5 - operand
    - isAutogenerated: 1
     integer_type - result type
     - precisionBits: 32
@@ -22943,7 +22943,7 @@ function_decl ftest1 test23.cpp 26:9
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl ftest2 test23.cpp 31:16
+function_decl ftest2 test23.cpp 32:16
 - isPublic: 1
  function_type - function type
   integer_type - function return type
@@ -22957,27 +22957,27 @@ function_decl ftest2 test23.cpp 31:16
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12: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 32:5 - function result
+ result_decl test23.cpp 33:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -22988,29 +22988,29 @@ function_decl ftest2 test23.cpp 31:16
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl ptr0 test23.cpp 31:30 - argument
+ parm_decl ptr0 test23.cpp 32:30 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test23.cpp 33:16 - code
+ return_expr test23.cpp 34:16 - code
   init_expr - operand
-   result_decl test23.cpp 32:5 - operand
+   result_decl test23.cpp 33:5 - operand
    - isAutogenerated: 1
     integer_type - result type
     - precisionBits: 32
@@ -23022,1638 +23022,1638 @@ function_decl ftest2 test23.cpp 31:16
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl ftest3 test23.cpp 36:10
+function_decl ftest3 test23.cpp 37: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
+   type_decl Data1 test23.cpp 11:8 - type name
    - isAutogenerated: 1
-   field_decl val test23.cpp 21:9 - field
+   field_decl val test23.cpp 22:9 - field
    - signed
     integer_cst 32 - decl size
-   field_decl ptrval test23.cpp 22:12 - field
+   field_decl ptrval test23.cpp 23:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl arr test23.cpp 23:14 - field
+   field_decl arr test23.cpp 24:14 - field
    - signed
     integer_cst 96 - decl size
-   field_decl str1 test23.cpp 24:17 - field
+   field_decl str1 test23.cpp 25:17 - field
    - signed
     integer_cst 64 - decl size
-   type_decl Data1 test23.cpp 11:1 - field
+   type_decl Data1 test23.cpp 12:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test23.cpp 10:8 - type name
+     type_decl Data1 test23.cpp 11:8 - type name
      - isAutogenerated: 1
-     field_decl val test23.cpp 21:9 - field
+     field_decl val test23.cpp 22:9 - field
      - signed
       integer_cst 32 - decl size
-     field_decl ptrval test23.cpp 22:12 - field
+     field_decl ptrval test23.cpp 23:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl arr test23.cpp 23:14 - field
+     field_decl arr test23.cpp 24:14 - field
      - signed
       integer_cst 96 - decl size
-     field_decl str1 test23.cpp 24:17 - field
+     field_decl str1 test23.cpp 25:17 - field
      - signed
       integer_cst 64 - decl size
-     type_decl Data1 test23.cpp 11:1 - field
+     type_decl Data1 test23.cpp 12:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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
+ result_decl test23.cpp 38: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
+ parm_decl this test23.cpp 37:28 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- parm_decl ptr0 test23.cpp 36:24 - argument
+ parm_decl ptr0 test23.cpp 37:24 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl Object1 test23.cpp 47:5
+function_decl Object1 test23.cpp 48: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 43:7 - type name
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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:26 - function result
+ result_decl test23.cpp 48: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 47:24 - argument
+ parm_decl this test23.cpp 48:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 47:20 - argument
+ parm_decl ptr1 test23.cpp 48:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 55:5 - code
+ bind_expr test23.cpp 56:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 48:21 - statement
-    expr_stmt test23.cpp 48:21 - operand
+   cleanup_point_expr test23.cpp 49:21 - statement
+    expr_stmt test23.cpp 49:21 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 48:21 - operand
+       component_ref test23.cpp 49:21 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl this test23.cpp 47:24 - operand
+          parm_decl this test23.cpp 48:24 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Object1 test23.cpp 43:7 - type name
+             type_decl Object1 test23.cpp 44:7 - type name
              - isAutogenerated: 1
-             field_decl dataptr test23.cpp 45:12 - field
+             field_decl dataptr test23.cpp 46:12 - field
              - unsigned
               integer_cst 64 - decl size
-             type_decl Object1 test23.cpp 44:1 - field
+             type_decl Object1 test23.cpp 45:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl dataptr test23.cpp 45:12 - field
+        field_decl dataptr test23.cpp 46:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 47:20 - operand
+       parm_decl ptr1 test23.cpp 48:20 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   if_stmt test23.cpp 50:9 - statement
+   if_stmt test23.cpp 51:9 - statement
     ne_expr - condition
-     component_ref test23.cpp 50:13 - operand
+     component_ref test23.cpp 51:13 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 47:24 - operand
+        parm_decl this test23.cpp 48:24 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 43:7 - type name
+           type_decl Object1 test23.cpp 44:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 45:12 - field
+           field_decl dataptr test23.cpp 46:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 44:1 - field
+           type_decl Object1 test23.cpp 45:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 45:12 - field
+      field_decl dataptr test23.cpp 46:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    cleanup_point_expr test23.cpp 52:27 - then
-     expr_stmt test23.cpp 52:27 - operand
+    cleanup_point_expr test23.cpp 53:27 - then
+     expr_stmt test23.cpp 53:27 - operand
       convert_expr - expresssion
-       call_expr test23.cpp 52:25 - operand
+       call_expr test23.cpp 53:25 - operand
         addr_expr - function
-         function_decl ftest1 test23.cpp 26:9 - operand
+         function_decl ftest1 test23.cpp 27:9 - operand
          - isExternal: 1
          - isPublic: 1
           method_type - function type
         non_lvalue_expr - arg
          - isUsed: 1
-         parm_decl ptr1 test23.cpp 47:20 - operand
+         parm_decl ptr1 test23.cpp 48:20 - operand
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-   cleanup_point_expr test23.cpp 54:26 - statement
-    expr_stmt test23.cpp 54:26 - operand
+   cleanup_point_expr test23.cpp 55:26 - statement
+    expr_stmt test23.cpp 55:26 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 54:24 - operand
+      call_expr test23.cpp 55:24 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        non_lvalue_expr - arg
-        component_ref test23.cpp 54:9 - operand
+        component_ref test23.cpp 55:9 - operand
          indirect_ref - object
           nop_expr - ref
            - isUsed: 1
-           parm_decl this test23.cpp 47:24 - operand
+           parm_decl this test23.cpp 48:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
-              type_decl Object1 test23.cpp 43:7 - type name
+              type_decl Object1 test23.cpp 44:7 - type name
               - isAutogenerated: 1
-              field_decl dataptr test23.cpp 45:12 - field
+              field_decl dataptr test23.cpp 46:12 - field
               - unsigned
                integer_cst 64 - decl size
-              type_decl Object1 test23.cpp 44:1 - field
+              type_decl Object1 test23.cpp 45:1 - field
               - isAutogenerated: 1
             integer_cst 64 - parm size
-         field_decl dataptr test23.cpp 45:12 - field
+         field_decl dataptr test23.cpp 46:12 - field
          - unsigned
           integer_cst 64 - decl size
   block - operand
-function_decl __base_ctor  test23.cpp 47:5
+function_decl __base_ctor  test23.cpp 48: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 43:7 - type name
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 55:5 - function result
+ result_decl test23.cpp 56: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 47:24 - argument
+ parm_decl this test23.cpp 48:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 47:20 - argument
+ parm_decl ptr1 test23.cpp 48:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 55:5 - code
+ bind_expr test23.cpp 56:5 - code
   statement_list - operand
-   cleanup_point_expr test23.cpp 48:21 - statement
-    expr_stmt test23.cpp 48:21 - operand
+   cleanup_point_expr test23.cpp 49:21 - statement
+    expr_stmt test23.cpp 49:21 - operand
      convert_expr - expresssion
       init_expr - operand
-       component_ref test23.cpp 48:21 - operand
+       component_ref test23.cpp 49:21 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl this test23.cpp 47:24 - operand
+          parm_decl this test23.cpp 48:24 - operand
           - isAutogenerated: 1
            pointer_type - decl type
             record_type - nested type
-             type_decl Object1 test23.cpp 43:7 - type name
+             type_decl Object1 test23.cpp 44:7 - type name
              - isAutogenerated: 1
-             field_decl dataptr test23.cpp 45:12 - field
+             field_decl dataptr test23.cpp 46:12 - field
              - unsigned
               integer_cst 64 - decl size
-             type_decl Object1 test23.cpp 44:1 - field
+             type_decl Object1 test23.cpp 45:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
-        field_decl dataptr test23.cpp 45:12 - field
+        field_decl dataptr test23.cpp 46:12 - field
         - unsigned
          integer_cst 64 - decl size
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 47:20 - operand
+       parm_decl ptr1 test23.cpp 48:20 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-   cond_expr test23.cpp 50:9 - statement
+   cond_expr test23.cpp 51:9 - statement
     ne_expr - operand
-     component_ref test23.cpp 50:13 - operand
+     component_ref test23.cpp 51:13 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 47:24 - operand
+        parm_decl this test23.cpp 48:24 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 43:7 - type name
+           type_decl Object1 test23.cpp 44:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 45:12 - field
+           field_decl dataptr test23.cpp 46:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 44:1 - field
+           type_decl Object1 test23.cpp 45:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 45:12 - field
+      field_decl dataptr test23.cpp 46:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    cleanup_point_expr test23.cpp 52:27 - operand
-     expr_stmt test23.cpp 52:27 - operand
+    cleanup_point_expr test23.cpp 53:27 - operand
+     expr_stmt test23.cpp 53:27 - operand
       convert_expr - expresssion
-       call_expr test23.cpp 52:25 - operand
+       call_expr test23.cpp 53:25 - operand
         addr_expr - function
-         function_decl ftest1 test23.cpp 26:9 - operand
+         function_decl ftest1 test23.cpp 27:9 - operand
          - isExternal: 1
          - isPublic: 1
           method_type - function type
         non_lvalue_expr - arg
          - isUsed: 1
-         parm_decl ptr1 test23.cpp 47:20 - operand
+         parm_decl ptr1 test23.cpp 48:20 - operand
           pointer_type - decl type
            record_type - nested type
-            type_decl Data1 test23.cpp 10:8 - type name
+            type_decl Data1 test23.cpp 11:8 - type name
             - isAutogenerated: 1
-            field_decl val test23.cpp 21:9 - field
+            field_decl val test23.cpp 22:9 - field
             - signed
              integer_cst 32 - decl size
-            field_decl ptrval test23.cpp 22:12 - field
+            field_decl ptrval test23.cpp 23:12 - field
             - unsigned
              integer_cst 64 - decl size
-            field_decl arr test23.cpp 23:14 - field
+            field_decl arr test23.cpp 24:14 - field
             - signed
              integer_cst 96 - decl size
-            field_decl str1 test23.cpp 24:17 - field
+            field_decl str1 test23.cpp 25:17 - field
             - signed
              integer_cst 64 - decl size
-            type_decl Data1 test23.cpp 11:1 - field
+            type_decl Data1 test23.cpp 12:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-    nop_expr test23.cpp 50:9 - operand
+    nop_expr test23.cpp 51:9 - operand
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 54:26 - statement
-    expr_stmt test23.cpp 54:26 - operand
+   cleanup_point_expr test23.cpp 55:26 - statement
+    expr_stmt test23.cpp 55:26 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 54:24 - operand
+      call_expr test23.cpp 55:24 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        non_lvalue_expr - arg
-        component_ref test23.cpp 54:9 - operand
+        component_ref test23.cpp 55:9 - operand
          indirect_ref - object
           nop_expr - ref
            - isUsed: 1
-           parm_decl this test23.cpp 47:24 - operand
+           parm_decl this test23.cpp 48:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
-              type_decl Object1 test23.cpp 43:7 - type name
+              type_decl Object1 test23.cpp 44:7 - type name
               - isAutogenerated: 1
-              field_decl dataptr test23.cpp 45:12 - field
+              field_decl dataptr test23.cpp 46:12 - field
               - unsigned
                integer_cst 64 - decl size
-              type_decl Object1 test23.cpp 44:1 - field
+              type_decl Object1 test23.cpp 45:1 - field
               - isAutogenerated: 1
             integer_cst 64 - parm size
-         field_decl dataptr test23.cpp 45:12 - field
+         field_decl dataptr test23.cpp 46:12 - field
          - unsigned
           integer_cst 64 - decl size
   block - operand
-function_decl __comp_ctor  test23.cpp 47:5
+function_decl __comp_ctor  test23.cpp 48: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 43:7 - type name
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 55:5 - function result
+ result_decl test23.cpp 56: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 47:24 - argument
+ parm_decl this test23.cpp 48:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 47:20 - argument
+ parm_decl ptr1 test23.cpp 48:20 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl func1 test23.cpp 57:10
+function_decl func1 test23.cpp 58: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 58:5 - function result
+ result_decl test23.cpp 59: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 57:33 - argument
+ parm_decl this test23.cpp 58:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 57:29 - argument
+ parm_decl ptr1 test23.cpp 58:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 59:23 - statement
-   expr_stmt test23.cpp 59:23 - operand
+  cleanup_point_expr test23.cpp 60:23 - statement
+   expr_stmt test23.cpp 60:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 59:9 - operand
+      component_ref test23.cpp 60:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 57:33 - operand
+         parm_decl this test23.cpp 58:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 43:7 - type name
+            type_decl Object1 test23.cpp 44:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 45:12 - field
+            field_decl dataptr test23.cpp 46:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 44:1 - field
+            type_decl Object1 test23.cpp 45:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 45:12 - field
+       field_decl dataptr test23.cpp 46:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 57:29 - operand
+       parm_decl ptr1 test23.cpp 58:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 60:9 - statement
+  if_stmt test23.cpp 61:9 - statement
    ne_expr - condition
-    component_ref test23.cpp 60:13 - operand
+    component_ref test23.cpp 61:13 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 57:33 - operand
+       parm_decl this test23.cpp 58:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
-          type_decl Object1 test23.cpp 43:7 - type name
+          type_decl Object1 test23.cpp 44:7 - type name
           - isAutogenerated: 1
-          field_decl dataptr test23.cpp 45:12 - field
+          field_decl dataptr test23.cpp 46:12 - field
           - unsigned
            integer_cst 64 - decl size
-          type_decl Object1 test23.cpp 44:1 - field
+          type_decl Object1 test23.cpp 45:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 62:27 - then
-    expr_stmt test23.cpp 62:27 - operand
+   cleanup_point_expr test23.cpp 63:27 - then
+    expr_stmt test23.cpp 63:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 62:25 - operand
+      call_expr test23.cpp 63:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 57:29 - operand
+        parm_decl ptr1 test23.cpp 58:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func2 test23.cpp 66:10
+function_decl func2 test23.cpp 67: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 67:5 - function result
+ result_decl test23.cpp 68: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 66:33 - argument
+ parm_decl this test23.cpp 67:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 66:29 - argument
+ parm_decl ptr1 test23.cpp 67:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 68:23 - statement
-   expr_stmt test23.cpp 68:23 - operand
+  cleanup_point_expr test23.cpp 69:23 - statement
+   expr_stmt test23.cpp 69:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 68:9 - operand
+      component_ref test23.cpp 69:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 66:33 - operand
+         parm_decl this test23.cpp 67:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 43:7 - type name
+            type_decl Object1 test23.cpp 44:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 45:12 - field
+            field_decl dataptr test23.cpp 46:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 44:1 - field
+            type_decl Object1 test23.cpp 45:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 45:12 - field
+       field_decl dataptr test23.cpp 46:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 66:29 - operand
+       parm_decl ptr1 test23.cpp 67:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 69:9 - statement
+  if_stmt test23.cpp 70:9 - statement
    ne_expr - condition
     nop_expr - operand
      - isUsed: 1
-     parm_decl ptr1 test23.cpp 66:29 - operand
+     parm_decl ptr1 test23.cpp 67:29 - operand
       pointer_type - decl type
        record_type - nested type
-        type_decl Data1 test23.cpp 10:8 - type name
+        type_decl Data1 test23.cpp 11:8 - type name
         - isAutogenerated: 1
-        field_decl val test23.cpp 21:9 - field
+        field_decl val test23.cpp 22:9 - field
         - signed
          integer_cst 32 - decl size
-        field_decl ptrval test23.cpp 22:12 - field
+        field_decl ptrval test23.cpp 23:12 - field
         - unsigned
          integer_cst 64 - decl size
-        field_decl arr test23.cpp 23:14 - field
+        field_decl arr test23.cpp 24:14 - field
         - signed
          integer_cst 96 - decl size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-        type_decl Data1 test23.cpp 11:1 - field
+        type_decl Data1 test23.cpp 12:1 - field
         - isAutogenerated: 1
       integer_cst 64 - parm size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 71:27 - then
-    expr_stmt test23.cpp 71:27 - operand
+   cleanup_point_expr test23.cpp 72:27 - then
+    expr_stmt test23.cpp 72:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 71:25 - operand
+      call_expr test23.cpp 72:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 66:29 - operand
+        parm_decl ptr1 test23.cpp 67:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func3 test23.cpp 75:10
+function_decl func3 test23.cpp 76: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 76:5 - function result
+ result_decl test23.cpp 77: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 75:33 - argument
+ parm_decl this test23.cpp 76:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 75:29 - argument
+ parm_decl ptr1 test23.cpp 76:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 77:23 - statement
-   expr_stmt test23.cpp 77:23 - operand
+  cleanup_point_expr test23.cpp 78:23 - statement
+   expr_stmt test23.cpp 78:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 77:9 - operand
+      component_ref test23.cpp 78:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 75:33 - operand
+         parm_decl this test23.cpp 76:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 43:7 - type name
+            type_decl Object1 test23.cpp 44:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 45:12 - field
+            field_decl dataptr test23.cpp 46:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 44:1 - field
+            type_decl Object1 test23.cpp 45:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 45:12 - field
+       field_decl dataptr test23.cpp 46:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 75:29 - operand
+       parm_decl ptr1 test23.cpp 76:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 78:9 - statement
-   eq_expr test23.cpp 78:14 - condition
-    component_ref test23.cpp 78:14 - operand
+  if_stmt test23.cpp 79:9 - statement
+   eq_expr test23.cpp 79:14 - condition
+    component_ref test23.cpp 79:14 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 75:33 - operand
+       parm_decl this test23.cpp 76:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
-          type_decl Object1 test23.cpp 43:7 - type name
+          type_decl Object1 test23.cpp 44:7 - type name
           - isAutogenerated: 1
-          field_decl dataptr test23.cpp 45:12 - field
+          field_decl dataptr test23.cpp 46:12 - field
           - unsigned
            integer_cst 64 - decl size
-          type_decl Object1 test23.cpp 44:1 - field
+          type_decl Object1 test23.cpp 45:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 80:27 - then
-    expr_stmt test23.cpp 80:27 - operand
+   cleanup_point_expr test23.cpp 81:27 - then
+    expr_stmt test23.cpp 81:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 80:25 - operand
+      call_expr test23.cpp 81:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 75:29 - operand
+        parm_decl ptr1 test23.cpp 76:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func4 test23.cpp 84:10
+function_decl func4 test23.cpp 85: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 85:5 - function result
+ result_decl test23.cpp 86: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 84:33 - argument
+ parm_decl this test23.cpp 85:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 84:29 - argument
+ parm_decl ptr1 test23.cpp 85:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 86:23 - statement
-   expr_stmt test23.cpp 86:23 - operand
+  cleanup_point_expr test23.cpp 87:23 - statement
+   expr_stmt test23.cpp 87:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 86:9 - operand
+      component_ref test23.cpp 87:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 84:33 - operand
+         parm_decl this test23.cpp 85:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 43:7 - type name
+            type_decl Object1 test23.cpp 44:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 45:12 - field
+            field_decl dataptr test23.cpp 46:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 44:1 - field
+            type_decl Object1 test23.cpp 45:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 45:12 - field
+       field_decl dataptr test23.cpp 46:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 84:29 - operand
+       parm_decl ptr1 test23.cpp 85:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  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
+  if_stmt test23.cpp 88:9 - statement
+   truth_andif_expr test23.cpp 88:22 - condition
+    eq_expr test23.cpp 88:14 - operand
+     component_ref test23.cpp 88:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 84:33 - operand
+        parm_decl this test23.cpp 85:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 43:7 - type name
+           type_decl Object1 test23.cpp 44:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 45:12 - field
+           field_decl dataptr test23.cpp 46:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 44:1 - field
+           type_decl Object1 test23.cpp 45:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 45:12 - field
+      field_decl dataptr test23.cpp 46: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 84:29 - operand
+      parm_decl ptr1 test23.cpp 85:29 - operand
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 10:8 - type name
+         type_decl Data1 test23.cpp 11:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 21:9 - field
+         field_decl val test23.cpp 22:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 22:12 - field
+         field_decl ptrval test23.cpp 23:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 23:14 - field
+         field_decl arr test23.cpp 24:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 24:17 - field
+         field_decl str1 test23.cpp 25:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 11:1 - field
+         type_decl Data1 test23.cpp 12:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 89:27 - then
-    expr_stmt test23.cpp 89:27 - operand
+   cleanup_point_expr test23.cpp 90:27 - then
+    expr_stmt test23.cpp 90:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 89:25 - operand
+      call_expr test23.cpp 90:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 84:29 - operand
+        parm_decl ptr1 test23.cpp 85:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func5 test23.cpp 93:10
+function_decl func5 test23.cpp 94: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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 94:5 - function result
+ result_decl test23.cpp 95: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 93:33 - argument
+ parm_decl this test23.cpp 94:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 93:29 - argument
+ parm_decl ptr1 test23.cpp 94:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 95:23 - statement
-   expr_stmt test23.cpp 95:23 - operand
+  cleanup_point_expr test23.cpp 96:23 - statement
+   expr_stmt test23.cpp 96:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 95:9 - operand
+      component_ref test23.cpp 96:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 93:33 - operand
+         parm_decl this test23.cpp 94:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
-            type_decl Object1 test23.cpp 43:7 - type name
+            type_decl Object1 test23.cpp 44:7 - type name
             - isAutogenerated: 1
-            field_decl dataptr test23.cpp 45:12 - field
+            field_decl dataptr test23.cpp 46:12 - field
             - unsigned
              integer_cst 64 - decl size
-            type_decl Object1 test23.cpp 44:1 - field
+            type_decl Object1 test23.cpp 45:1 - field
             - isAutogenerated: 1
           integer_cst 64 - parm size
-       field_decl dataptr test23.cpp 45:12 - field
+       field_decl dataptr test23.cpp 46:12 - field
        - unsigned
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 93:29 - operand
+       parm_decl ptr1 test23.cpp 94:29 - operand
         pointer_type - decl type
          record_type - nested type
-          type_decl Data1 test23.cpp 10:8 - type name
+          type_decl Data1 test23.cpp 11:8 - type name
           - isAutogenerated: 1
-          field_decl val test23.cpp 21:9 - field
+          field_decl val test23.cpp 22:9 - field
           - signed
            integer_cst 32 - decl size
-          field_decl ptrval test23.cpp 22:12 - field
+          field_decl ptrval test23.cpp 23:12 - field
           - unsigned
            integer_cst 64 - decl size
-          field_decl arr test23.cpp 23:14 - field
+          field_decl arr test23.cpp 24:14 - field
           - signed
            integer_cst 96 - decl size
-          field_decl str1 test23.cpp 24:17 - field
+          field_decl str1 test23.cpp 25:17 - field
           - signed
            integer_cst 64 - decl size
-          type_decl Data1 test23.cpp 11:1 - field
+          type_decl Data1 test23.cpp 12:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  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
+  if_stmt test23.cpp 97:9 - statement
+   truth_orif_expr test23.cpp 97:22 - condition
+    eq_expr test23.cpp 97:14 - operand
+     component_ref test23.cpp 97:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 93:33 - operand
+        parm_decl this test23.cpp 94:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
-           type_decl Object1 test23.cpp 43:7 - type name
+           type_decl Object1 test23.cpp 44:7 - type name
            - isAutogenerated: 1
-           field_decl dataptr test23.cpp 45:12 - field
+           field_decl dataptr test23.cpp 46:12 - field
            - unsigned
             integer_cst 64 - decl size
-           type_decl Object1 test23.cpp 44:1 - field
+           type_decl Object1 test23.cpp 45:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-      field_decl dataptr test23.cpp 45:12 - field
+      field_decl dataptr test23.cpp 46:12 - field
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    eq_expr test23.cpp 96:26 - operand
+    eq_expr test23.cpp 97:26 - operand
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 93:29 - operand
+      parm_decl ptr1 test23.cpp 94:29 - operand
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 10:8 - type name
+         type_decl Data1 test23.cpp 11:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 21:9 - field
+         field_decl val test23.cpp 22:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 22:12 - field
+         field_decl ptrval test23.cpp 23:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 23:14 - field
+         field_decl arr test23.cpp 24:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 24:17 - field
+         field_decl str1 test23.cpp 25:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 11:1 - field
+         type_decl Data1 test23.cpp 12:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 98:27 - then
-    expr_stmt test23.cpp 98:27 - operand
+   cleanup_point_expr test23.cpp 99:27 - then
+    expr_stmt test23.cpp 99:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 98:25 - operand
+      call_expr test23.cpp 99:25 - operand
        addr_expr - function
-        function_decl ftest1 test23.cpp 26:9 - operand
+        function_decl ftest1 test23.cpp 27:9 - operand
         - isExternal: 1
         - isPublic: 1
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 93:29 - operand
+        parm_decl ptr1 test23.cpp 94:29 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func6 test23.cpp 102:10
+function_decl func6 test23.cpp 103: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
@@ -24670,25 +24670,25 @@ function_decl func6 test23.cpp 102:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 103:5 - function result
+ result_decl test23.cpp 104: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
+ parm_decl this test23.cpp 103:29 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 102:25 - argument
+ parm_decl ptr1 test23.cpp 103:25 - argument
   pointer_type - decl type
    type_decl FuncPtr1 test23.cpp 6:16 - type name
    function_type - nested type
@@ -24700,11 +24700,11 @@ function_decl func6 test23.cpp 102:10
       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
+ cleanup_point_expr test23.cpp 105:15 - code
+  expr_stmt test23.cpp 105:15 - operand
+   call_expr test23.cpp 105:13 - expresssion
     - isUsed: 1
-    parm_decl ptr1 test23.cpp 102:25 - function
+    parm_decl ptr1 test23.cpp 103:25 - function
      pointer_type - decl type
       type_decl FuncPtr1 test23.cpp 6:16 - type name
       function_type - nested type
@@ -24716,93 +24716,93 @@ function_decl func6 test23.cpp 102:10
          type_decl void <built-in> 0:0 - type name
          - isAutogenerated: 1
      integer_cst 64 - parm size
-function_decl func7 test23.cpp 107:10
+function_decl func7 test23.cpp 108: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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
+ result_decl test23.cpp 109: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
+ parm_decl this test23.cpp 108:27 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 107:23 - argument
+ parm_decl ptr1 test23.cpp 108:23 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 110:20 - code
-  var_decl fptr2 test23.cpp 109:18 - operand
+ bind_expr test23.cpp 111:20 - code
+  var_decl fptr2 test23.cpp 110:18 - operand
   - isUsed: 1
    integer_cst 64 - decl size
    pointer_type - var type
@@ -24814,146 +24814,146 @@ function_decl func7 test23.cpp 107:10
      tree_list - arg types
       pointer_type - value
        record_type - nested type
-        type_decl Data1 test23.cpp 10:8 - type name
+        type_decl Data1 test23.cpp 11:8 - type name
         - isAutogenerated: 1
-        field_decl val test23.cpp 21:9 - field
+        field_decl val test23.cpp 22:9 - field
         - signed
          integer_cst 32 - decl size
-        field_decl ptrval test23.cpp 22:12 - field
+        field_decl ptrval test23.cpp 23:12 - field
         - unsigned
          integer_cst 64 - decl size
-        field_decl arr test23.cpp 23:14 - field
+        field_decl arr test23.cpp 24:14 - field
         - signed
          integer_cst 96 - decl size
-        field_decl str1 test23.cpp 24:17 - field
+        field_decl str1 test23.cpp 25:17 - field
         - signed
          integer_cst 64 - decl size
-        type_decl Data1 test23.cpp 11:1 - field
+        type_decl Data1 test23.cpp 12: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
+   decl_expr test23.cpp 110:18 - statement
+    var_decl fptr2 test23.cpp 110: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
+   cleanup_point_expr test23.cpp 111:20 - statement
+    expr_stmt test23.cpp 111:20 - operand
+     call_expr test23.cpp 111:14 - expresssion
+      var_decl fptr2 test23.cpp 110:18 - function
       - isUsed: 1
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 107:23 - arg
+      parm_decl ptr1 test23.cpp 108:23 - arg
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 10:8 - type name
+         type_decl Data1 test23.cpp 11:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 21:9 - field
+         field_decl val test23.cpp 22:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 22:12 - field
+         field_decl ptrval test23.cpp 23:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 23:14 - field
+         field_decl arr test23.cpp 24:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 24:17 - field
+         field_decl str1 test23.cpp 25:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 11:1 - field
+         type_decl Data1 test23.cpp 12:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
   block - operand
-   var_decl fptr2 test23.cpp 109:18 - block vars
+   var_decl fptr2 test23.cpp 110:18 - block vars
    - isUsed: 1
-function_decl func8 test23.cpp 113:10
+function_decl func8 test23.cpp 114: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
+   type_decl Object1 test23.cpp 44:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test23.cpp 45:12 - field
+   field_decl dataptr test23.cpp 46:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test23.cpp 44:1 - field
+   type_decl Object1 test23.cpp 45:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test23.cpp 43:7 - type name
+     type_decl Object1 test23.cpp 44:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test23.cpp 45:12 - field
+     field_decl dataptr test23.cpp 46:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test23.cpp 44:1 - field
+     type_decl Object1 test23.cpp 45:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test23.cpp 10:8 - type name
+      type_decl Data1 test23.cpp 11:8 - type name
       - isAutogenerated: 1
-      field_decl val test23.cpp 21:9 - field
+      field_decl val test23.cpp 22:9 - field
       - signed
        integer_cst 32 - decl size
-      field_decl ptrval test23.cpp 22:12 - field
+      field_decl ptrval test23.cpp 23:12 - field
       - unsigned
        integer_cst 64 - decl size
-      field_decl arr test23.cpp 23:14 - field
+      field_decl arr test23.cpp 24:14 - field
       - signed
        integer_cst 96 - decl size
-      field_decl str1 test23.cpp 24:17 - field
+      field_decl str1 test23.cpp 25:17 - field
       - signed
        integer_cst 64 - decl size
-      type_decl Data1 test23.cpp 11:1 - field
+      type_decl Data1 test23.cpp 12: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
+ result_decl test23.cpp 115: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
+ parm_decl this test23.cpp 114:27 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test23.cpp 43:7 - type name
+    type_decl Object1 test23.cpp 44:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test23.cpp 45:12 - field
+    field_decl dataptr test23.cpp 46:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test23.cpp 44:1 - field
+    type_decl Object1 test23.cpp 45:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 113:23 - argument
+ parm_decl ptr1 test23.cpp 114:23 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test23.cpp 10:8 - type name
+    type_decl Data1 test23.cpp 11:8 - type name
     - isAutogenerated: 1
-    field_decl val test23.cpp 21:9 - field
+    field_decl val test23.cpp 22:9 - field
     - signed
      integer_cst 32 - decl size
-    field_decl ptrval test23.cpp 22:12 - field
+    field_decl ptrval test23.cpp 23:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl arr test23.cpp 23:14 - field
+    field_decl arr test23.cpp 24:14 - field
     - signed
      integer_cst 96 - decl size
-    field_decl str1 test23.cpp 24:17 - field
+    field_decl str1 test23.cpp 25:17 - field
     - signed
      integer_cst 64 - decl size
-    type_decl Data1 test23.cpp 11:1 - field
+    type_decl Data1 test23.cpp 12:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test23.cpp 116:29 - code
-  var_decl fptr2 test23.cpp 115:18 - operand
+ bind_expr test23.cpp 117:29 - code
+  var_decl fptr2 test23.cpp 116:18 - operand
   - isUsed: 1
    integer_cst 128 - decl size
    constructor - initial
@@ -24968,7 +24968,7 @@ function_decl func8 test23.cpp 113:10
     - unsigned
      integer_cst 64 - decl size
     addr_expr - value
-     function_decl ftest3 test23.cpp 36:10 - operand
+     function_decl ftest3 test23.cpp 37:10 - operand
      - isExternal: 1
      - isPublic: 1
       method_type - function type
@@ -24985,71 +24985,71 @@ function_decl func8 test23.cpp 113:10
     - 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
+   cleanup_point_expr test23.cpp 116:34 - statement
+    decl_expr test23.cpp 116:34 - operand
+     var_decl fptr2 test23.cpp 116: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
+   cleanup_point_expr test23.cpp 117:29 - statement
+    expr_stmt test23.cpp 117:29 - operand
+     call_expr test23.cpp 117: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
+          component_ref test23.cpp 117:28 - operand
+           var_decl fptr2 test23.cpp 116: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
+       component_ref test23.cpp 117:28 - operand
+        var_decl fptr2 test23.cpp 116: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
+         pointer_plus_expr test23.cpp 117: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
+              parm_decl ptr1 test23.cpp 114:23 - operand
                pointer_type - decl type
                 record_type - nested type
-                 type_decl Data1 test23.cpp 10:8 - type name
+                 type_decl Data1 test23.cpp 11:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test23.cpp 21:9 - field
+                 field_decl val test23.cpp 22:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 field_decl ptrval test23.cpp 22:12 - field
+                 field_decl ptrval test23.cpp 23:12 - field
                  - unsigned
                   integer_cst 64 - decl size
-                 field_decl arr test23.cpp 23:14 - field
+                 field_decl arr test23.cpp 24:14 - field
                  - signed
                   integer_cst 96 - decl size
-                 field_decl str1 test23.cpp 24:17 - field
+                 field_decl str1 test23.cpp 25:17 - field
                  - signed
                   integer_cst 64 - decl size
-                 type_decl Data1 test23.cpp 11:1 - field
+                 type_decl Data1 test23.cpp 12: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
+              component_ref test23.cpp 117:28 - operand
+               var_decl fptr2 test23.cpp 116: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
+          nop_expr test23.cpp 117:28 - operand
            plus_expr - operand
             nop_expr - operand
-             component_ref test23.cpp 116:28 - operand
-              var_decl fptr2 test23.cpp 115:18 - object
+             component_ref test23.cpp 117:28 - operand
+              var_decl fptr2 test23.cpp 116:18 - object
               - isUsed: 1
               field_decl __pfn test23.cpp 8:44 - field
               - unsigned
@@ -25058,57 +25058,220 @@ function_decl func8 test23.cpp 113:10
       pointer_plus_expr - arg
        non_lvalue_expr - operand
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 113:23 - operand
+        parm_decl ptr1 test23.cpp 114:23 - operand
          pointer_type - decl type
           record_type - nested type
-           type_decl Data1 test23.cpp 10:8 - type name
+           type_decl Data1 test23.cpp 11:8 - type name
            - isAutogenerated: 1
-           field_decl val test23.cpp 21:9 - field
+           field_decl val test23.cpp 22:9 - field
            - signed
             integer_cst 32 - decl size
-           field_decl ptrval test23.cpp 22:12 - field
+           field_decl ptrval test23.cpp 23:12 - field
            - unsigned
             integer_cst 64 - decl size
-           field_decl arr test23.cpp 23:14 - field
+           field_decl arr test23.cpp 24:14 - field
            - signed
             integer_cst 96 - decl size
-           field_decl str1 test23.cpp 24:17 - field
+           field_decl str1 test23.cpp 25:17 - field
            - signed
             integer_cst 64 - decl size
-           type_decl Data1 test23.cpp 11:1 - field
+           type_decl Data1 test23.cpp 12: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
+        component_ref test23.cpp 117:28 - operand
+         var_decl fptr2 test23.cpp 116: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
+      parm_decl ptr1 test23.cpp 114:23 - arg
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test23.cpp 10:8 - type name
+         type_decl Data1 test23.cpp 11:8 - type name
          - isAutogenerated: 1
-         field_decl val test23.cpp 21:9 - field
+         field_decl val test23.cpp 22:9 - field
          - signed
           integer_cst 32 - decl size
-         field_decl ptrval test23.cpp 22:12 - field
+         field_decl ptrval test23.cpp 23:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl arr test23.cpp 23:14 - field
+         field_decl arr test23.cpp 24:14 - field
          - signed
           integer_cst 96 - decl size
-         field_decl str1 test23.cpp 24:17 - field
+         field_decl str1 test23.cpp 25:17 - field
          - signed
           integer_cst 64 - decl size
-         type_decl Data1 test23.cpp 11:1 - field
+         type_decl Data1 test23.cpp 12:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
   block - operand
-   var_decl fptr2 test23.cpp 115:18 - block vars
+   var_decl fptr2 test23.cpp 116:18 - block vars
    - isUsed: 1
+function_decl func9 test23.cpp 120: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 44:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 46:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 45:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 44:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 46:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 45:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    reference_type - value
+     type_decl FuncPtr4 test23.cpp 9: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
+        void_type - nested type
+         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
+    tree_list - chain
+     pointer_type - value
+      record_type - nested type
+       type_decl Data1 test23.cpp 11:8 - type name
+       - isAutogenerated: 1
+       field_decl val test23.cpp 22:9 - field
+       - signed
+        integer_cst 32 - decl size
+       field_decl ptrval test23.cpp 23:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       field_decl arr test23.cpp 24:14 - field
+       - signed
+        integer_cst 96 - decl size
+       field_decl str1 test23.cpp 25:17 - field
+       - signed
+        integer_cst 64 - decl size
+       type_decl Data1 test23.cpp 12: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 121: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 120:48 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 44:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 46:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 45:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 120:25 - argument
+  reference_type - decl type
+   type_decl FuncPtr4 test23.cpp 9: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
+      void_type - nested type
+       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
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr2 test23.cpp 120:44 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 11:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 22:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 23:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 24:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 25:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 12:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ cleanup_point_expr test23.cpp 122:19 - code
+  expr_stmt test23.cpp 122:19 - operand
+   call_expr test23.cpp 122:13 - expresssion
+    convert_expr - function
+     - isUsed: 1
+     parm_decl ptr1 test23.cpp 120:25 - operand
+      reference_type - decl type
+       type_decl FuncPtr4 test23.cpp 9: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
+          void_type - nested type
+           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
+      integer_cst 64 - parm size
+    nop_expr - arg
+     - isUsed: 1
+     parm_decl ptr2 test23.cpp 120:44 - operand
+      pointer_type - decl type
+       record_type - nested type
+        type_decl Data1 test23.cpp 11:8 - type name
+        - isAutogenerated: 1
+        field_decl val test23.cpp 22:9 - field
+        - signed
+         integer_cst 32 - decl size
+        field_decl ptrval test23.cpp 23:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        field_decl arr test23.cpp 24:14 - field
+        - signed
+         integer_cst 96 - decl size
+        field_decl str1 test23.cpp 25:17 - field
+        - signed
+         integer_cst 64 - decl size
+        type_decl Data1 test23.cpp 12:1 - field
+        - isAutogenerated: 1
+      integer_cst 64 - parm size
 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 831dbd1..7c24bf0 100644
--- a/test/test23-02.txt
+++ b/test/test23-02.txt
@@ -221,45 +221,46 @@ ftest2: pointer_type ptr0,
 ftest3: pointer_type ptr0, 
 Object1: pointer_type ptr1, 
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:52:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:53: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:52:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:53: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:62:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:63: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:71:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:72: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:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:81: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:89:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:90: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:98:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:99: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
+test23.cpp:105:13: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1();
              ^
 func7: pointer_type ptr1, 
 func8: pointer_type ptr1, 
+func9: pointer_type ptr2, 
 fill: pointer_type __first, pointer_type __last, 
 _Alloc_hider: 
 __base_dtor : 
diff --git a/test/test23-03.txt b/test/test23-03.txt
index 06fd6ce..4f1cd5f 100644
--- a/test/test23-03.txt
+++ b/test/test23-03.txt
@@ -2632,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:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 component_ref : ptr1, this->dataptr, 
@@ -2724,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:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55: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, 
@@ -2930,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:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
@@ -3102,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:98:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:99:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
@@ -3134,7 +3134,7 @@ 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
+test23.cpp:105:13: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1();
              ^
 function_decl func7: 
@@ -3212,7 +3212,7 @@ 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
+test23.cpp:117:28: warning: Using parameter 'ptr1' without checking for null pointer
          (ptr1->*fptr2)(ptr1);
                             ^
 parm_decl ptr1: ptr1, 
@@ -3240,7 +3240,7 @@ 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
+test23.cpp:117:23: warning: Using parameter 'ptr1' without checking for null pointer
          (ptr1->*fptr2)(ptr1);
                        ^
 parm_decl ptr1: ptr1, 
@@ -3298,6 +3298,39 @@ field_decl __delta: ptr1,
 integer_cst 64: ptr1, 
 block : ptr1, 
 var_decl fptr2: ptr1, 
+function_decl func9: 
+cleanup_point_expr : ptr2, 
+expr_stmt : ptr2, 
+call_expr : ptr2, 
+convert_expr : ptr2, 
+parm_decl ptr1: ptr2, 
+reference_type : ptr2, 
+type_decl FuncPtr4: ptr2, 
+function_type : ptr2, 
+void_type : ptr2, 
+type_decl void: ptr2, 
+tree_list : ptr2, 
+pointer_type : ptr2, 
+void_type : ptr2, 
+type_decl void: ptr2, 
+tree_list : ptr2, 
+void_type : ptr2, 
+type_decl void: ptr2, 
+integer_cst 64: ptr2, 
+parm_decl ptr2: ptr2, 
+pointer_type : ptr2, 
+record_type : ptr2, 
+type_decl Data1: ptr2, 
+field_decl val: ptr2, 
+integer_cst 32: ptr2, 
+field_decl ptrval: ptr2, 
+integer_cst 64: ptr2, 
+field_decl arr: ptr2, 
+integer_cst 96: ptr2, 
+field_decl str1: ptr2, 
+integer_cst 64: ptr2, 
+type_decl Data1: ptr2, 
+integer_cst 64: ptr2, 
 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 4fc5ad5..39e36f4 100644
--- a/test/test23-04.txt
+++ b/test/test23-04.txt
@@ -1,25 +1,25 @@
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:99: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
+test23.cpp:105: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
+test23.cpp:117: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
+test23.cpp:117: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 4fc5ad5..39e36f4 100644
--- a/test/test23-05.txt
+++ b/test/test23-05.txt
@@ -1,25 +1,25 @@
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55:24: warning: Using field 'this->dataptr' without checking for null pointer
          dataptr->ftest1();
                         ^
 test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:54:24: warning: Using field 'this->dataptr' without checking for null pointer
+test23.cpp:55:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:98:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:99: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
+test23.cpp:105: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
+test23.cpp:117: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
+test23.cpp:117:23: warning: Using parameter 'ptr1' without checking for null pointer
          (ptr1->*fptr2)(ptr1);
                        ^
diff --git a/test/test23.cpp b/test/test23.cpp
index bddd1a9..46b3883 100644
--- a/test/test23.cpp
+++ b/test/test23.cpp
@@ -6,6 +6,7 @@ struct Data1;
 typedef void (*FuncPtr1) (void);
 typedef void (*FuncPtr2) (Data1 *ptr);
 typedef void (Data1::*FuncPtr3) (Data1 *ptr);
+typedef void (&FuncPtr4)(const void *const);
 
 struct Data1
 {
@@ -115,4 +116,9 @@ class Object1
         FuncPtr3 fptr2 = &Data1::ftest3;
         (ptr1->*fptr2)(ptr1);
     }
+
+    void func9(FuncPtr4 ptr1, Data1 *const ptr2)
+    {
+        ptr1(ptr2);
+    }
 };