Update test 36.

5 files changed, 2769 insertions, 398 deletions

diff --git a/test/test36-01.txt b/test/test36-01.txt
index d7d39e7..5febad2 100644
--- a/test/test36-01.txt
+++ b/test/test36-01.txt
@@ -132,7 +132,981 @@ function_decl getData3 test36.cpp 8:12
     field_decl ptrval test36.cpp 6:12 - field
     - unsigned
      integer_cst 64 - decl size
-function_decl getData1 test36.cpp 27:12
+function_decl Data2 test36.cpp 19:13
+- isVirtual: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    integer_type - value
+    - precisionBits: 32
+    - signed
+     type_decl int <built-in> 0:0 - type name
+     - isAutogenerated: 1
+     integer_cst 32 - type size
+     integer_cst -2147483648 - min value
+     integer_cst 2147483647 - max value
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test36.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 test36.cpp 19:20 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ parm_decl __in_chrg test36.cpp 19:20 - argument
+ - isAutogenerated: 1
+  integer_type - decl type
+  - precisionBits: 32
+  - signed
+   type_decl int <built-in> 0:0 - type name
+   - isAutogenerated: 1
+   integer_cst 32 - type size
+   integer_cst -2147483648 - min value
+   integer_cst 2147483647 - max value
+  integer_cst 32 - parm size
+ must_not_throw_expr test36.cpp 19:13 - code
+  statement_list - operand
+   bind_expr test36.cpp 21:5 - statement
+    statement_list - operand
+     cleanup_point_expr test36.cpp 20:5 - statement
+      expr_stmt test36.cpp 20:5 - operand
+       convert_expr - expresssion
+        modify_expr - operand
+         component_ref - operand
+          indirect_ref - object
+           nop_expr - ref
+            parm_decl this test36.cpp 19:20 - operand
+            - isAutogenerated: 1
+             pointer_type - decl type
+              record_type - nested type
+               type_decl Data2 test36.cpp 14:8 - type name
+               - isAutogenerated: 1
+               field_decl _vptr.Data2 test36.cpp 14:8 - field
+               - unsigned
+               - isVirtual: 1
+               - isAutogenerated: 1
+                integer_cst 64 - decl size
+               field_decl val test36.cpp 16:9 - field
+               - signed
+                integer_cst 32 - decl size
+               field_decl ptrval test36.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               field_decl arr test36.cpp 18:14 - field
+               - signed
+                integer_cst 96 - decl size
+               type_decl Data2 test36.cpp 15:1 - field
+               - isAutogenerated: 1
+             integer_cst 64 - parm size
+          field_decl _vptr.Data2 test36.cpp 14:8 - field
+          - unsigned
+          - isVirtual: 1
+          - isAutogenerated: 1
+           integer_cst 64 - decl size
+         pointer_plus_expr - operand
+          addr_expr - operand
+           var_decl _ZTV5Data2 test36.cpp 14:8 - operand
+           - isUsed: 1
+           - isVirtual: 1
+           - isAutogenerated: 1
+            integer_cst 256 - decl size
+            constructor - initial
+             array_type - constructor type
+              pointer_type - element type
+               type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+               - isAutogenerated: 1
+               function_type - nested type
+                integer_type - function return type
+                - precisionBits: 32
+                - signed
+                 type_decl int <built-in> 0:0 - type name
+                 - isAutogenerated: 1
+                 integer_cst 32 - type size
+                 integer_cst -2147483648 - min value
+                 integer_cst 2147483647 - max value
+              integer_type - domain
+              - precisionBits: 64
+              - signed
+               integer_cst 64 - type size
+               integer_cst 0 - min value
+               integer_cst 3 - max value
+             nop_expr - value
+              integer_cst 0 - operand
+             nop_expr - value
+              addr_expr - operand
+               var_decl _ZTI5Data2 test36.cpp 14:8 - operand
+               - isAutogenerated: 1
+                integer_cst 128 - decl size
+                record_type - var type
+                 type_decl __class_type_info_pseudo <built-in> 0:0 - type name
+                 field_decl <built-in> 0:0 - field
+                 - signed
+                  integer_cst 128 - decl size
+             nop_expr - value
+              addr_expr - operand
+               function_decl __comp_dtor  test36.cpp 19:13 - operand
+               - isVirtual: 1
+               - isExternal: 1
+               - isPublic: 1
+                method_type - function type
+                 void_type - method return type
+             nop_expr - value
+              addr_expr - operand
+               function_decl __deleting_dtor  test36.cpp 19:13 - operand
+               - isVirtual: 1
+               - isExternal: 1
+               - isPublic: 1
+                method_type - function type
+                 void_type - method return type
+            array_type - var type
+             pointer_type - element type
+              type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+              - isAutogenerated: 1
+              function_type - nested type
+               integer_type - function return type
+               - precisionBits: 32
+               - signed
+                type_decl int <built-in> 0:0 - type name
+                - isAutogenerated: 1
+                integer_cst 32 - type size
+                integer_cst -2147483648 - min value
+                integer_cst 2147483647 - max value
+             integer_type - domain
+             - precisionBits: 64
+             - signed
+              integer_cst 64 - type size
+              integer_cst 0 - min value
+              integer_cst 3 - max value
+          integer_cst 16 - operand
+     cleanup_stmt test36.cpp 20:5 - statement
+      statement_list - body
+      modify_expr - expresssion
+       indirect_ref - operand
+        nop_expr - ref
+         parm_decl this test36.cpp 19:20 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data2 test36.cpp 14:8 - type name
+            - isAutogenerated: 1
+            field_decl _vptr.Data2 test36.cpp 14:8 - field
+            - unsigned
+            - isVirtual: 1
+            - isAutogenerated: 1
+             integer_cst 64 - decl size
+            field_decl val test36.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test36.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test36.cpp 18:14 - field
+            - signed
+             integer_cst 96 - decl size
+            type_decl Data2 test36.cpp 15:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       constructor - operand
+        record_type - constructor type
+         field_decl _vptr.Data2 test36.cpp 14:8 - field
+         - signed
+          integer_cst 64 - decl size
+         field_decl val test36.cpp 14:8 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test36.cpp 14:8 - field
+         - signed
+          integer_cst 64 - decl size
+         field_decl arr test36.cpp 14:8 - field
+         - signed
+          integer_cst 96 - decl size
+    block - operand
+   label_expr test36.cpp 21:5 - statement
+    label_decl test36.cpp 20:5 - operand
+    - isAutogenerated: 1
+   if_stmt test36.cpp 21:5 - statement
+    ne_expr - condition
+     bit_and_expr - operand
+      parm_decl __in_chrg test36.cpp 19:20 - operand
+      - isAutogenerated: 1
+       integer_type - decl type
+       - precisionBits: 32
+       - signed
+        type_decl int <built-in> 0:0 - type name
+        - isAutogenerated: 1
+        integer_cst 32 - type size
+        integer_cst -2147483648 - min value
+        integer_cst 2147483647 - max value
+       integer_cst 32 - parm size
+      integer_cst 1 - operand
+     integer_cst 0 - operand
+    cleanup_point_expr test36.cpp 21:5 - then
+     expr_stmt test36.cpp 21:5 - operand
+      call_expr test36.cpp 21:5 - expresssion
+       addr_expr - function
+        function_decl operator delete <built-in> 0:0 - operand
+        - isAutogenerated: 1
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+          void_type - function return type
+          tree_list - attribute
+           identifier_node externally_visible - purpose
+       nop_expr - arg
+        parm_decl this test36.cpp 19:20 - operand
+        - isAutogenerated: 1
+         pointer_type - decl type
+          record_type - nested type
+           type_decl Data2 test36.cpp 14:8 - type name
+           - isAutogenerated: 1
+           field_decl _vptr.Data2 test36.cpp 14:8 - field
+           - unsigned
+           - isVirtual: 1
+           - isAutogenerated: 1
+            integer_cst 64 - decl size
+           field_decl val test36.cpp 16:9 - field
+           - signed
+            integer_cst 32 - decl size
+           field_decl ptrval test36.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           field_decl arr test36.cpp 18:14 - field
+           - signed
+            integer_cst 96 - decl size
+           type_decl Data2 test36.cpp 15:1 - field
+           - isAutogenerated: 1
+         integer_cst 64 - parm size
+function_decl __base_dtor  test36.cpp 19:13
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 21:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 19:20 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ must_not_throw_expr test36.cpp 19:13 - code
+  statement_list - operand
+   bind_expr test36.cpp 21:5 - statement
+    statement_list - operand
+     cleanup_point_expr test36.cpp 20:5 - statement
+      expr_stmt test36.cpp 20:5 - operand
+       convert_expr - expresssion
+        modify_expr - operand
+         component_ref - operand
+          indirect_ref - object
+           nop_expr - ref
+            parm_decl this test36.cpp 19:20 - operand
+            - isAutogenerated: 1
+             pointer_type - decl type
+              record_type - nested type
+               type_decl Data2 test36.cpp 14:8 - type name
+               - isAutogenerated: 1
+               field_decl _vptr.Data2 test36.cpp 14:8 - field
+               - unsigned
+               - isVirtual: 1
+               - isAutogenerated: 1
+                integer_cst 64 - decl size
+               field_decl val test36.cpp 16:9 - field
+               - signed
+                integer_cst 32 - decl size
+               field_decl ptrval test36.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               field_decl arr test36.cpp 18:14 - field
+               - signed
+                integer_cst 96 - decl size
+               type_decl Data2 test36.cpp 15:1 - field
+               - isAutogenerated: 1
+             integer_cst 64 - parm size
+          field_decl _vptr.Data2 test36.cpp 14:8 - field
+          - unsigned
+          - isVirtual: 1
+          - isAutogenerated: 1
+           integer_cst 64 - decl size
+         pointer_plus_expr - operand
+          addr_expr - operand
+           var_decl _ZTV5Data2 test36.cpp 14:8 - operand
+           - isUsed: 1
+           - isVirtual: 1
+           - isAutogenerated: 1
+            integer_cst 256 - decl size
+            constructor - initial
+             array_type - constructor type
+              pointer_type - element type
+               type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+               - isAutogenerated: 1
+               function_type - nested type
+                integer_type - function return type
+                - precisionBits: 32
+                - signed
+                 type_decl int <built-in> 0:0 - type name
+                 - isAutogenerated: 1
+                 integer_cst 32 - type size
+                 integer_cst -2147483648 - min value
+                 integer_cst 2147483647 - max value
+              integer_type - domain
+              - precisionBits: 64
+              - signed
+               integer_cst 64 - type size
+               integer_cst 0 - min value
+               integer_cst 3 - max value
+             nop_expr - value
+              integer_cst 0 - operand
+             nop_expr - value
+              addr_expr - operand
+               var_decl _ZTI5Data2 test36.cpp 14:8 - operand
+               - isAutogenerated: 1
+                integer_cst 128 - decl size
+                record_type - var type
+                 type_decl __class_type_info_pseudo <built-in> 0:0 - type name
+                 field_decl <built-in> 0:0 - field
+                 - signed
+                  integer_cst 128 - decl size
+             nop_expr - value
+              addr_expr - operand
+               function_decl __comp_dtor  test36.cpp 19:13 - operand
+               - isVirtual: 1
+               - isExternal: 1
+               - isPublic: 1
+                method_type - function type
+                 void_type - method return type
+             nop_expr - value
+              addr_expr - operand
+               function_decl __deleting_dtor  test36.cpp 19:13 - operand
+               - isVirtual: 1
+               - isExternal: 1
+               - isPublic: 1
+                method_type - function type
+                 void_type - method return type
+            array_type - var type
+             pointer_type - element type
+              type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+              - isAutogenerated: 1
+              function_type - nested type
+               integer_type - function return type
+               - precisionBits: 32
+               - signed
+                type_decl int <built-in> 0:0 - type name
+                - isAutogenerated: 1
+                integer_cst 32 - type size
+                integer_cst -2147483648 - min value
+                integer_cst 2147483647 - max value
+             integer_type - domain
+             - precisionBits: 64
+             - signed
+              integer_cst 64 - type size
+              integer_cst 0 - min value
+              integer_cst 3 - max value
+          integer_cst 16 - operand
+     try_finally test36.cpp 20:5 - statement
+      statement_list - operand
+      modify_expr - operand
+       indirect_ref - operand
+        nop_expr - ref
+         parm_decl this test36.cpp 19:20 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data2 test36.cpp 14:8 - type name
+            - isAutogenerated: 1
+            field_decl _vptr.Data2 test36.cpp 14:8 - field
+            - unsigned
+            - isVirtual: 1
+            - isAutogenerated: 1
+             integer_cst 64 - decl size
+            field_decl val test36.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test36.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test36.cpp 18:14 - field
+            - signed
+             integer_cst 96 - decl size
+            type_decl Data2 test36.cpp 15:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       constructor - operand
+        record_type - constructor type
+         field_decl _vptr.Data2 test36.cpp 14:8 - field
+         - signed
+          integer_cst 64 - decl size
+         field_decl val test36.cpp 14:8 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test36.cpp 14:8 - field
+         - signed
+          integer_cst 64 - decl size
+         field_decl arr test36.cpp 14:8 - field
+         - signed
+          integer_cst 96 - decl size
+    block - operand
+   label_expr test36.cpp 21:5 - statement
+    label_decl test36.cpp 20:5 - operand
+    - isAutogenerated: 1
+   cond_expr test36.cpp 21:5 - statement
+    ne_expr - operand
+     bit_and_expr - operand
+      integer_cst 0 - operand
+      integer_cst 1 - operand
+     integer_cst 0 - operand
+    cleanup_point_expr test36.cpp 21:5 - operand
+     expr_stmt test36.cpp 21:5 - operand
+      call_expr test36.cpp 21:5 - expresssion
+       addr_expr - function
+        function_decl operator delete <built-in> 0:0 - operand
+        - isAutogenerated: 1
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+          void_type - function return type
+          tree_list - attribute
+           identifier_node externally_visible - purpose
+       nop_expr - arg
+        parm_decl this test36.cpp 19:20 - operand
+        - isAutogenerated: 1
+         pointer_type - decl type
+          record_type - nested type
+           type_decl Data2 test36.cpp 14:8 - type name
+           - isAutogenerated: 1
+           field_decl _vptr.Data2 test36.cpp 14:8 - field
+           - unsigned
+           - isVirtual: 1
+           - isAutogenerated: 1
+            integer_cst 64 - decl size
+           field_decl val test36.cpp 16:9 - field
+           - signed
+            integer_cst 32 - decl size
+           field_decl ptrval test36.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           field_decl arr test36.cpp 18:14 - field
+           - signed
+            integer_cst 96 - decl size
+           type_decl Data2 test36.cpp 15:1 - field
+           - isAutogenerated: 1
+         integer_cst 64 - parm size
+    nop_expr test36.cpp 21:5 - operand
+     integer_cst 0 - operand
+function_decl __comp_dtor  test36.cpp 19:13
+- isVirtual: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 21:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 19:20 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl __deleting_dtor  test36.cpp 19:13
+- isVirtual: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 21:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 19:20 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+  call_expr test36.cpp 21:5 - statement
+   addr_expr - function
+    function_decl __comp_dtor  test36.cpp 19:13 - operand
+    - isVirtual: 1
+    - isPublic: 1
+     method_type - function type
+      void_type - method return type
+   parm_decl this test36.cpp 19:20 - arg
+   - isAutogenerated: 1
+    pointer_type - decl type
+     record_type - nested type
+      type_decl Data2 test36.cpp 14:8 - type name
+      - isAutogenerated: 1
+      field_decl _vptr.Data2 test36.cpp 14:8 - field
+      - unsigned
+      - isVirtual: 1
+      - isAutogenerated: 1
+       integer_cst 64 - decl size
+      field_decl val test36.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test36.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test36.cpp 18:14 - field
+      - signed
+       integer_cst 96 - decl size
+      type_decl Data2 test36.cpp 15:1 - field
+      - isAutogenerated: 1
+    integer_cst 64 - parm size
+  label_expr - statement
+   label_decl test36.cpp 21:5 - operand
+   - isAutogenerated: 1
+  call_expr test36.cpp 21:5 - statement
+   addr_expr - function
+    function_decl operator delete <built-in> 0:0 - operand
+    - isAutogenerated: 1
+    - isExternal: 1
+    - isPublic: 1
+     function_type - function type
+      void_type - function return type
+      tree_list - attribute
+       identifier_node externally_visible - purpose
+   nop_expr - arg
+    parm_decl this test36.cpp 19:20 - operand
+    - isAutogenerated: 1
+     pointer_type - decl type
+      record_type - nested type
+       type_decl Data2 test36.cpp 14:8 - type name
+       - isAutogenerated: 1
+       field_decl _vptr.Data2 test36.cpp 14:8 - field
+       - unsigned
+       - isVirtual: 1
+       - isAutogenerated: 1
+        integer_cst 64 - decl size
+       field_decl val test36.cpp 16:9 - field
+       - signed
+        integer_cst 32 - decl size
+       field_decl ptrval test36.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       field_decl arr test36.cpp 18:14 - field
+       - signed
+        integer_cst 96 - decl size
+       type_decl Data2 test36.cpp 15:1 - field
+       - isAutogenerated: 1
+     integer_cst 64 - parm size
+function_decl getData3 test36.cpp 22:12
+- isPublic: 1
+ method_type - function type
+  pointer_type - method return type
+   record_type - nested type
+    type_decl Data1 test36.cpp 3:8 - type name
+    - isAutogenerated: 1
+    field_decl val test36.cpp 5:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 6:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 7:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data1 test36.cpp 4:1 - field
+    - isAutogenerated: 1
+  record_type - method base type
+   type_decl Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 23:5 - function result
+ - isAutogenerated: 1
+  pointer_type - result type
+   record_type - nested type
+    type_decl Data1 test36.cpp 3:8 - type name
+    - isAutogenerated: 1
+    field_decl val test36.cpp 5:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 6:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 7:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data1 test36.cpp 4:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - decl size
+ - isUsed: 1
+ parm_decl this test36.cpp 22:21 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ return_expr test36.cpp 24:16 - code
+  init_expr - operand
+   result_decl test36.cpp 23:5 - operand
+   - isAutogenerated: 1
+    pointer_type - result type
+     record_type - nested type
+      type_decl Data1 test36.cpp 3:8 - type name
+      - isAutogenerated: 1
+      field_decl val test36.cpp 5:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test36.cpp 6:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test36.cpp 7:14 - field
+      - signed
+       integer_cst 96 - decl size
+      type_decl Data1 test36.cpp 4:1 - field
+      - isAutogenerated: 1
+    integer_cst 64 - decl size
+   component_ref test36.cpp 24:16 - operand
+    indirect_ref - object
+     nop_expr - ref
+      - isUsed: 1
+      parm_decl this test36.cpp 22:21 - operand
+      - isAutogenerated: 1
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data2 test36.cpp 14:8 - type name
+         - isAutogenerated: 1
+         field_decl _vptr.Data2 test36.cpp 14:8 - field
+         - unsigned
+         - isVirtual: 1
+         - isAutogenerated: 1
+          integer_cst 64 - decl size
+         field_decl val test36.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test36.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         field_decl arr test36.cpp 18:14 - field
+         - signed
+          integer_cst 96 - decl size
+         type_decl Data2 test36.cpp 15:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+function_decl getData1 test36.cpp 38:12
 - isPublic: 1
  method_type - function type
   pointer_type - method return type
@@ -151,34 +1125,40 @@ function_decl getData1 test36.cpp 27:12
     type_decl Data1 test36.cpp 4:1 - field
     - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp3 test36.cpp 36:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     field_decl tmp3 test36.cpp 36:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 28:5 - function result
+ result_decl test36.cpp 39:5 - function result
  - isAutogenerated: 1
   pointer_type - result type
    record_type - nested type
@@ -197,24 +1177,27 @@ function_decl getData1 test36.cpp 27:12
     - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
- parm_decl this test36.cpp 27:21 - argument
+ parm_decl this test36.cpp 38:21 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp3 test36.cpp 36:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test36.cpp 29:16 - code
+ return_expr test36.cpp 40:16 - code
   init_expr - operand
-   result_decl test36.cpp 28:5 - operand
+   result_decl test36.cpp 39:5 - operand
    - isAutogenerated: 1
     pointer_type - result type
      record_type - nested type
@@ -232,29 +1215,32 @@ function_decl getData1 test36.cpp 27:12
       type_decl Data1 test36.cpp 4:1 - field
       - isAutogenerated: 1
     integer_cst 64 - decl size
-   component_ref test36.cpp 29:16 - operand
+   component_ref test36.cpp 40:16 - operand
     indirect_ref - object
      nop_expr - ref
       - isUsed: 1
-      parm_decl this test36.cpp 27:21 - operand
+      parm_decl this test36.cpp 38:21 - operand
       - isAutogenerated: 1
        pointer_type - decl type
         record_type - nested type
-         type_decl Object1 test36.cpp 22:7 - type name
+         type_decl Object1 test36.cpp 32:7 - type name
          - isAutogenerated: 1
-         field_decl tmp1 test36.cpp 24:12 - field
+         field_decl tmp1 test36.cpp 34:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl tmp2 test36.cpp 25:12 - field
+         field_decl tmp2 test36.cpp 35:12 - field
          - unsigned
           integer_cst 64 - decl size
-         type_decl Object1 test36.cpp 23:1 - field
+         field_decl tmp3 test36.cpp 36:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Object1 test36.cpp 33:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-function_decl getData2 test36.cpp 32:12
+function_decl getData2 test36.cpp 43:12
 - isPublic: 1
  method_type - function type
   tree_list - attribute
@@ -275,34 +1261,40 @@ function_decl getData2 test36.cpp 32:12
     type_decl Data1 test36.cpp 4:1 - field
     - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp3 test36.cpp 36:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     field_decl tmp3 test36.cpp 36:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 33:5 - function result
+ result_decl test36.cpp 44:5 - function result
  - isAutogenerated: 1
   pointer_type - result type
    record_type - nested type
@@ -321,24 +1313,27 @@ function_decl getData2 test36.cpp 32:12
     - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
- parm_decl this test36.cpp 32:54 - argument
+ parm_decl this test36.cpp 43:54 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp3 test36.cpp 36:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test36.cpp 34:16 - code
+ return_expr test36.cpp 45:16 - code
   init_expr - operand
-   result_decl test36.cpp 33:5 - operand
+   result_decl test36.cpp 44:5 - operand
    - isAutogenerated: 1
     pointer_type - result type
      record_type - nested type
@@ -356,84 +1351,96 @@ function_decl getData2 test36.cpp 32:12
       type_decl Data1 test36.cpp 4:1 - field
       - isAutogenerated: 1
     integer_cst 64 - decl size
-   component_ref test36.cpp 34:16 - operand
+   component_ref test36.cpp 45:16 - operand
     indirect_ref - object
      nop_expr - ref
       - isUsed: 1
-      parm_decl this test36.cpp 32:54 - operand
+      parm_decl this test36.cpp 43:54 - operand
       - isAutogenerated: 1
        pointer_type - decl type
         record_type - nested type
-         type_decl Object1 test36.cpp 22:7 - type name
+         type_decl Object1 test36.cpp 32:7 - type name
          - isAutogenerated: 1
-         field_decl tmp1 test36.cpp 24:12 - field
+         field_decl tmp1 test36.cpp 34:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         field_decl tmp2 test36.cpp 35:12 - field
          - unsigned
           integer_cst 64 - decl size
-         field_decl tmp2 test36.cpp 25:12 - field
+         field_decl tmp3 test36.cpp 36:12 - field
          - unsigned
           integer_cst 64 - decl size
-         type_decl Object1 test36.cpp 23:1 - field
+         type_decl Object1 test36.cpp 33:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-function_decl func1 test36.cpp 37:10
+function_decl func1 test36.cpp 48: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 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   field_decl tmp3 test36.cpp 36:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp3 test36.cpp 36:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 38:5 - function result
+ result_decl test36.cpp 49:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test36.cpp 37:16 - argument
+ parm_decl this test36.cpp 48:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    field_decl tmp3 test36.cpp 36:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test36.cpp 49:71 - code
-  var_decl ptr1 test36.cpp 39:16 - operand
+ bind_expr test36.cpp 60:71 - code
+  var_decl ptr1 test36.cpp 50:16 - operand
    integer_cst 64 - decl size
    pointer_type - var type
     record_type - nested type
@@ -451,15 +1458,15 @@ function_decl func1 test36.cpp 37:10
      type_decl Data1 test36.cpp 4:1 - field
      - isAutogenerated: 1
   statement_list - operand
-   decl_expr test36.cpp 39:27 - statement
-    var_decl ptr1 test36.cpp 39:16 - operand
-   cleanup_point_expr test36.cpp 39:27 - statement
-    expr_stmt test36.cpp 39:27 - operand
+   decl_expr test36.cpp 50:27 - statement
+    var_decl ptr1 test36.cpp 50:16 - operand
+   cleanup_point_expr test36.cpp 50:27 - statement
+    expr_stmt test36.cpp 50:27 - operand
      convert_expr - expresssion
       init_expr - operand
-       var_decl ptr1 test36.cpp 39:16 - operand
+       var_decl ptr1 test36.cpp 50:16 - operand
        nop_expr - operand
-        call_expr test36.cpp 39:27 - operand
+        call_expr test36.cpp 50:27 - operand
          addr_expr - function
           function_decl operator new <built-in> 0:0 - operand
           - isAutogenerated: 1
@@ -474,11 +1481,11 @@ function_decl func1 test36.cpp 37:10
              tree_list - chain
               identifier_node externally_visible - purpose
          integer_cst 32 - arg
-   cleanup_point_expr test36.cpp 40:57 - statement
-    expr_stmt test36.cpp 40:57 - operand
-     call_expr test36.cpp 40:31 - expresssion
+   cleanup_point_expr test36.cpp 51:57 - statement
+    expr_stmt test36.cpp 51:57 - operand
+     call_expr test36.cpp 51:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -495,11 +1502,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 41:64 - statement
-    expr_stmt test36.cpp 41:64 - operand
-     call_expr test36.cpp 41:31 - expresssion
+   cleanup_point_expr test36.cpp 52:64 - statement
+    expr_stmt test36.cpp 52:64 - operand
+     call_expr test36.cpp 52:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -516,11 +1523,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 42:57 - statement
-    expr_stmt test36.cpp 42:57 - operand
-     call_expr test36.cpp 42:31 - expresssion
+   cleanup_point_expr test36.cpp 53:57 - statement
+    expr_stmt test36.cpp 53:57 - operand
+     call_expr test36.cpp 53:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -537,11 +1544,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 43:61 - statement
-    expr_stmt test36.cpp 43:61 - operand
-     call_expr test36.cpp 43:31 - expresssion
+   cleanup_point_expr test36.cpp 54:61 - statement
+    expr_stmt test36.cpp 54:61 - operand
+     call_expr test36.cpp 54:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -558,11 +1565,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 44:55 - statement
-    expr_stmt test36.cpp 44:55 - operand
-     call_expr test36.cpp 44:31 - expresssion
+   cleanup_point_expr test36.cpp 55:55 - statement
+    expr_stmt test36.cpp 55:55 - operand
+     call_expr test36.cpp 55:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -579,11 +1586,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 45:61 - statement
-    expr_stmt test36.cpp 45:61 - operand
-     call_expr test36.cpp 45:31 - expresssion
+   cleanup_point_expr test36.cpp 56:61 - statement
+    expr_stmt test36.cpp 56:61 - operand
+     call_expr test36.cpp 56:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -600,11 +1607,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 46:58 - statement
-    expr_stmt test36.cpp 46:58 - operand
-     call_expr test36.cpp 46:31 - expresssion
+   cleanup_point_expr test36.cpp 57:58 - statement
+    expr_stmt test36.cpp 57:58 - operand
+     call_expr test36.cpp 57:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -621,11 +1628,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 47:64 - statement
-    expr_stmt test36.cpp 47:64 - operand
-     call_expr test36.cpp 47:31 - expresssion
+   cleanup_point_expr test36.cpp 58:64 - statement
+    expr_stmt test36.cpp 58:64 - operand
+     call_expr test36.cpp 58:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -642,11 +1649,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst this->tmp1 - operand
         - stringLength: 11
-   cleanup_point_expr test36.cpp 48:65 - statement
-    expr_stmt test36.cpp 48:65 - operand
-     call_expr test36.cpp 48:31 - expresssion
+   cleanup_point_expr test36.cpp 59:65 - statement
+    expr_stmt test36.cpp 59:65 - operand
+     call_expr test36.cpp 59:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -663,11 +1670,11 @@ function_decl func1 test36.cpp 37:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 49:71 - statement
-    expr_stmt test36.cpp 49:71 - operand
-     call_expr test36.cpp 49:31 - expresssion
+   cleanup_point_expr test36.cpp 60:71 - statement
+    expr_stmt test36.cpp 60:71 - operand
+     call_expr test36.cpp 60:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -685,63 +1692,72 @@ function_decl func1 test36.cpp 37:10
         string_cst this->tmp1 - operand
         - stringLength: 11
   block - operand
-   var_decl ptr1 test36.cpp 39:16 - block vars
-function_decl func2 test36.cpp 52:10
+   var_decl ptr1 test36.cpp 50:16 - block vars
+function_decl func2 test36.cpp 63: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 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp3 test36.cpp 36:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     field_decl tmp3 test36.cpp 36:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 53:5 - function result
+ result_decl test36.cpp 64:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test36.cpp 52:16 - argument
+ parm_decl this test36.cpp 63:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp3 test36.cpp 36:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test36.cpp 64:71 - code
-  var_decl ptr1 test36.cpp 54:16 - operand
+ bind_expr test36.cpp 75:71 - code
+  var_decl ptr1 test36.cpp 65:16 - operand
    integer_cst 64 - decl size
    pointer_type - var type
     record_type - nested type
@@ -759,15 +1775,15 @@ function_decl func2 test36.cpp 52:10
      type_decl Data1 test36.cpp 4:1 - field
      - isAutogenerated: 1
   statement_list - operand
-   decl_expr test36.cpp 54:35 - statement
-    var_decl ptr1 test36.cpp 54:16 - operand
-   cleanup_point_expr test36.cpp 54:35 - statement
-    expr_stmt test36.cpp 54:35 - operand
+   decl_expr test36.cpp 65:35 - statement
+    var_decl ptr1 test36.cpp 65:16 - operand
+   cleanup_point_expr test36.cpp 65:35 - statement
+    expr_stmt test36.cpp 65:35 - operand
      convert_expr - expresssion
       init_expr - operand
-       var_decl ptr1 test36.cpp 54:16 - operand
+       var_decl ptr1 test36.cpp 65:16 - operand
        nop_expr - operand
-        call_expr test36.cpp 54:35 - operand
+        call_expr test36.cpp 65:35 - operand
          addr_expr - function
           function_decl operator new [] <built-in> 0:0 - operand
           - isAutogenerated: 1
@@ -782,11 +1798,11 @@ function_decl func2 test36.cpp 52:10
              tree_list - chain
               identifier_node externally_visible - purpose
          integer_cst 320 - arg
-   cleanup_point_expr test36.cpp 55:57 - statement
-    expr_stmt test36.cpp 55:57 - operand
-     call_expr test36.cpp 55:31 - expresssion
+   cleanup_point_expr test36.cpp 66:57 - statement
+    expr_stmt test36.cpp 66:57 - operand
+     call_expr test36.cpp 66:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -803,11 +1819,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 56:64 - statement
-    expr_stmt test36.cpp 56:64 - operand
-     call_expr test36.cpp 56:31 - expresssion
+   cleanup_point_expr test36.cpp 67:64 - statement
+    expr_stmt test36.cpp 67:64 - operand
+     call_expr test36.cpp 67:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -824,11 +1840,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 57:57 - statement
-    expr_stmt test36.cpp 57:57 - operand
-     call_expr test36.cpp 57:31 - expresssion
+   cleanup_point_expr test36.cpp 68:57 - statement
+    expr_stmt test36.cpp 68:57 - operand
+     call_expr test36.cpp 68:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -845,11 +1861,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 58:61 - statement
-    expr_stmt test36.cpp 58:61 - operand
-     call_expr test36.cpp 58:31 - expresssion
+   cleanup_point_expr test36.cpp 69:61 - statement
+    expr_stmt test36.cpp 69:61 - operand
+     call_expr test36.cpp 69:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -866,11 +1882,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 59:55 - statement
-    expr_stmt test36.cpp 59:55 - operand
-     call_expr test36.cpp 59:31 - expresssion
+   cleanup_point_expr test36.cpp 70:55 - statement
+    expr_stmt test36.cpp 70:55 - operand
+     call_expr test36.cpp 70:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -887,11 +1903,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 60:61 - statement
-    expr_stmt test36.cpp 60:61 - operand
-     call_expr test36.cpp 60:31 - expresssion
+   cleanup_point_expr test36.cpp 71:61 - statement
+    expr_stmt test36.cpp 71:61 - operand
+     call_expr test36.cpp 71:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -908,11 +1924,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 61:58 - statement
-    expr_stmt test36.cpp 61:58 - operand
-     call_expr test36.cpp 61:31 - expresssion
+   cleanup_point_expr test36.cpp 72:58 - statement
+    expr_stmt test36.cpp 72:58 - operand
+     call_expr test36.cpp 72:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -929,11 +1945,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 62:64 - statement
-    expr_stmt test36.cpp 62:64 - operand
-     call_expr test36.cpp 62:31 - expresssion
+   cleanup_point_expr test36.cpp 73:64 - statement
+    expr_stmt test36.cpp 73:64 - operand
+     call_expr test36.cpp 73:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -950,11 +1966,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst this->tmp1 - operand
         - stringLength: 11
-   cleanup_point_expr test36.cpp 63:65 - statement
-    expr_stmt test36.cpp 63:65 - operand
-     call_expr test36.cpp 63:31 - expresssion
+   cleanup_point_expr test36.cpp 74:65 - statement
+    expr_stmt test36.cpp 74:65 - operand
+     call_expr test36.cpp 74:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -971,11 +1987,11 @@ function_decl func2 test36.cpp 52:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 64:71 - statement
-    expr_stmt test36.cpp 64:71 - operand
-     call_expr test36.cpp 64:31 - expresssion
+   cleanup_point_expr test36.cpp 75:71 - statement
+    expr_stmt test36.cpp 75:71 - operand
+     call_expr test36.cpp 75:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -993,63 +2009,72 @@ function_decl func2 test36.cpp 52:10
         string_cst this->tmp1 - operand
         - stringLength: 11
   block - operand
-   var_decl ptr1 test36.cpp 54:16 - block vars
-function_decl func3 test36.cpp 67:10
+   var_decl ptr1 test36.cpp 65:16 - block vars
+function_decl func3 test36.cpp 78: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 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp3 test36.cpp 36:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     field_decl tmp3 test36.cpp 36:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 68:5 - function result
+ result_decl test36.cpp 79:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test36.cpp 67:16 - argument
+ parm_decl this test36.cpp 78:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp3 test36.cpp 36:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test36.cpp 79:71 - code
-  var_decl ptr1 test36.cpp 69:14 - operand
+ bind_expr test36.cpp 90:71 - code
+  var_decl ptr1 test36.cpp 80:14 - operand
    integer_cst 64 - decl size
    pointer_type - var type
     integer_type - nested type
@@ -1061,15 +2086,15 @@ function_decl func3 test36.cpp 67:10
      integer_cst -2147483648 - min value
      integer_cst 2147483647 - max value
   statement_list - operand
-   decl_expr test36.cpp 69:31 - statement
-    var_decl ptr1 test36.cpp 69:14 - operand
-   cleanup_point_expr test36.cpp 69:31 - statement
-    expr_stmt test36.cpp 69:31 - operand
+   decl_expr test36.cpp 80:31 - statement
+    var_decl ptr1 test36.cpp 80:14 - operand
+   cleanup_point_expr test36.cpp 80:31 - statement
+    expr_stmt test36.cpp 80:31 - operand
      convert_expr - expresssion
       init_expr - operand
-       var_decl ptr1 test36.cpp 69:14 - operand
+       var_decl ptr1 test36.cpp 80:14 - operand
        nop_expr - operand
-        call_expr test36.cpp 69:31 - operand
+        call_expr test36.cpp 80:31 - operand
          addr_expr - function
           function_decl operator new [] <built-in> 0:0 - operand
           - isAutogenerated: 1
@@ -1084,11 +2109,11 @@ function_decl func3 test36.cpp 67:10
              tree_list - chain
               identifier_node externally_visible - purpose
          integer_cst 40 - arg
-   cleanup_point_expr test36.cpp 70:57 - statement
-    expr_stmt test36.cpp 70:57 - operand
-     call_expr test36.cpp 70:31 - expresssion
+   cleanup_point_expr test36.cpp 81:57 - statement
+    expr_stmt test36.cpp 81:57 - operand
+     call_expr test36.cpp 81:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1105,11 +2130,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 71:64 - statement
-    expr_stmt test36.cpp 71:64 - operand
-     call_expr test36.cpp 71:31 - expresssion
+   cleanup_point_expr test36.cpp 82:64 - statement
+    expr_stmt test36.cpp 82:64 - operand
+     call_expr test36.cpp 82:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1126,11 +2151,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 72:57 - statement
-    expr_stmt test36.cpp 72:57 - operand
-     call_expr test36.cpp 72:31 - expresssion
+   cleanup_point_expr test36.cpp 83:57 - statement
+    expr_stmt test36.cpp 83:57 - operand
+     call_expr test36.cpp 83:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1147,11 +2172,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 73:61 - statement
-    expr_stmt test36.cpp 73:61 - operand
-     call_expr test36.cpp 73:31 - expresssion
+   cleanup_point_expr test36.cpp 84:61 - statement
+    expr_stmt test36.cpp 84:61 - operand
+     call_expr test36.cpp 84:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1168,11 +2193,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 74:55 - statement
-    expr_stmt test36.cpp 74:55 - operand
-     call_expr test36.cpp 74:31 - expresssion
+   cleanup_point_expr test36.cpp 85:55 - statement
+    expr_stmt test36.cpp 85:55 - operand
+     call_expr test36.cpp 85:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1189,11 +2214,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 75:61 - statement
-    expr_stmt test36.cpp 75:61 - operand
-     call_expr test36.cpp 75:31 - expresssion
+   cleanup_point_expr test36.cpp 86:61 - statement
+    expr_stmt test36.cpp 86:61 - operand
+     call_expr test36.cpp 86:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1210,11 +2235,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst - operand
         - stringLength: 1
-   cleanup_point_expr test36.cpp 76:58 - statement
-    expr_stmt test36.cpp 76:58 - operand
-     call_expr test36.cpp 76:31 - expresssion
+   cleanup_point_expr test36.cpp 87:58 - statement
+    expr_stmt test36.cpp 87:58 - operand
+     call_expr test36.cpp 87:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1231,11 +2256,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 77:64 - statement
-    expr_stmt test36.cpp 77:64 - operand
-     call_expr test36.cpp 77:31 - expresssion
+   cleanup_point_expr test36.cpp 88:64 - statement
+    expr_stmt test36.cpp 88:64 - operand
+     call_expr test36.cpp 88:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1252,11 +2277,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst this->tmp1 - operand
         - stringLength: 11
-   cleanup_point_expr test36.cpp 78:65 - statement
-    expr_stmt test36.cpp 78:65 - operand
-     call_expr test36.cpp 78:31 - expresssion
+   cleanup_point_expr test36.cpp 89:65 - statement
+    expr_stmt test36.cpp 89:65 - operand
+     call_expr test36.cpp 89:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1273,11 +2298,11 @@ function_decl func3 test36.cpp 67:10
        addr_expr - operand
         string_cst ptr1 - operand
         - stringLength: 5
-   cleanup_point_expr test36.cpp 79:71 - statement
-    expr_stmt test36.cpp 79:71 - operand
-     call_expr test36.cpp 79:31 - expresssion
+   cleanup_point_expr test36.cpp 90:71 - statement
+    expr_stmt test36.cpp 90:71 - operand
+     call_expr test36.cpp 90:31 - expresssion
       addr_expr - function
-       function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+       function_decl paranuckerInternalTest test36.cpp 30:6 - operand
        - isExternal: 1
        - isPublic: 1
         function_type - function type
@@ -1295,149 +2320,891 @@ function_decl func3 test36.cpp 67:10
         string_cst this->tmp1 - operand
         - stringLength: 11
   block - operand
-   var_decl ptr1 test36.cpp 69:14 - block vars
-function_decl func4 test36.cpp 82:10
+   var_decl ptr1 test36.cpp 80:14 - block vars
+function_decl func4 test36.cpp 93:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
   record_type - method base type
-   type_decl Object1 test36.cpp 22:7 - type name
+   type_decl Object1 test36.cpp 32:7 - type name
    - isAutogenerated: 1
-   field_decl tmp1 test36.cpp 24:12 - field
+   field_decl tmp1 test36.cpp 34:12 - field
    - unsigned
     integer_cst 64 - decl size
-   field_decl tmp2 test36.cpp 25:12 - field
+   field_decl tmp2 test36.cpp 35:12 - field
    - unsigned
     integer_cst 64 - decl size
-   type_decl Object1 test36.cpp 23:1 - field
+   field_decl tmp3 test36.cpp 36:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test36.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test36.cpp 22:7 - type name
+     type_decl Object1 test36.cpp 32:7 - type name
      - isAutogenerated: 1
-     field_decl tmp1 test36.cpp 24:12 - field
+     field_decl tmp1 test36.cpp 34:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp2 test36.cpp 35:12 - field
      - unsigned
       integer_cst 64 - decl size
-     field_decl tmp2 test36.cpp 25:12 - field
+     field_decl tmp3 test36.cpp 36:12 - field
      - unsigned
       integer_cst 64 - decl size
-     type_decl Object1 test36.cpp 23:1 - field
+     type_decl Object1 test36.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     void_type - value
      type_decl void <built-in> 0:0 - type name
      - isAutogenerated: 1
- result_decl test36.cpp 83:5 - function result
+ result_decl test36.cpp 94:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test36.cpp 82:16 - argument
+ parm_decl this test36.cpp 93:16 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test36.cpp 22:7 - type name
+    type_decl Object1 test36.cpp 32:7 - type name
     - isAutogenerated: 1
-    field_decl tmp1 test36.cpp 24:12 - field
+    field_decl tmp1 test36.cpp 34:12 - field
     - unsigned
      integer_cst 64 - decl size
-    field_decl tmp2 test36.cpp 25:12 - field
+    field_decl tmp2 test36.cpp 35:12 - field
     - unsigned
      integer_cst 64 - decl size
-    type_decl Object1 test36.cpp 23:1 - field
+    field_decl tmp3 test36.cpp 36:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test36.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  if_stmt test36.cpp 84:9 - statement
-   eq_expr test36.cpp 84:15 - condition
-    var_decl k test36.cpp 18:5 - operand
-    - isUsed: 1
-     integer_cst 32 - decl size
-     integer_type - var type
-     - precisionBits: 32
-     - signed
-      type_decl int <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 32 - type size
-      integer_cst -2147483648 - min value
-      integer_cst 2147483647 - max value
-    integer_cst 10 - operand
-   cleanup_point_expr test36.cpp 85:29 - then
-    expr_stmt test36.cpp 85:29 - operand
-     convert_expr - expresssion
-      modify_expr - operand
-       component_ref test36.cpp 85:13 - operand
-        indirect_ref - object
-         nop_expr - ref
-          - isUsed: 1
-          parm_decl this test36.cpp 82:16 - operand
-          - isAutogenerated: 1
-           pointer_type - decl type
-            record_type - nested type
-             type_decl Object1 test36.cpp 22:7 - type name
-             - isAutogenerated: 1
-             field_decl tmp1 test36.cpp 24:12 - field
-             - unsigned
-              integer_cst 64 - decl size
-             field_decl tmp2 test36.cpp 25:12 - field
-             - unsigned
-              integer_cst 64 - decl size
-             type_decl Object1 test36.cpp 23:1 - field
-             - isAutogenerated: 1
-           integer_cst 64 - parm size
-        field_decl tmp1 test36.cpp 24:12 - field
-        - unsigned
-         integer_cst 64 - decl size
+  cleanup_point_expr test36.cpp 95:25 - statement
+   expr_stmt test36.cpp 95:25 - operand
+    convert_expr - expresssion
+     modify_expr - operand
+      component_ref test36.cpp 95:9 - operand
+       indirect_ref - object
+        nop_expr - ref
+         - isUsed: 1
+         parm_decl this test36.cpp 93:16 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Object1 test36.cpp 32:7 - type name
+            - isAutogenerated: 1
+            field_decl tmp1 test36.cpp 34:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl tmp2 test36.cpp 35:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl tmp3 test36.cpp 36:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Object1 test36.cpp 33:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl tmp1 test36.cpp 34:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+      nop_expr - operand
        nop_expr - operand
-        nop_expr - operand
-         call_expr test36.cpp 85:24 - operand
-          addr_expr - function
-           function_decl operator new <built-in> 0:0 - operand
-           - isAutogenerated: 1
-           - isExternal: 1
-           - isPublic: 1
-            function_type - function type
-             pointer_type - function return type
-             tree_list - attribute
-              identifier_node alloc_size - purpose
-              tree_list - value
-               integer_cst 1 - value
-              tree_list - chain
-               identifier_node externally_visible - purpose
-          integer_cst 32 - arg
-   cleanup_point_expr test36.cpp 87:29 - else
-    expr_stmt test36.cpp 87:29 - operand
-     convert_expr - expresssion
-      modify_expr - operand
-       component_ref test36.cpp 87:13 - operand
-        indirect_ref - object
-         nop_expr - ref
-          - isUsed: 1
-          parm_decl this test36.cpp 82:16 - operand
+        call_expr test36.cpp 95:20 - operand
+         addr_expr - function
+          function_decl operator new <built-in> 0:0 - operand
           - isAutogenerated: 1
-           pointer_type - decl type
-            record_type - nested type
-             type_decl Object1 test36.cpp 22:7 - type name
+          - isExternal: 1
+          - isPublic: 1
+           function_type - function type
+            pointer_type - function return type
+            tree_list - attribute
+             identifier_node alloc_size - purpose
+             tree_list - value
+              integer_cst 1 - value
+             tree_list - chain
+              identifier_node externally_visible - purpose
+         integer_cst 32 - arg
+  cleanup_point_expr test36.cpp 96:63 - statement
+   expr_stmt test36.cpp 96:63 - operand
+    call_expr test36.cpp 96:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownVars - operand
+       - stringLength: 10
+     nop_expr - arg
+      addr_expr - operand
+       string_cst this->tmp1 - operand
+       - stringLength: 11
+  cleanup_point_expr test36.cpp 97:70 - statement
+   expr_stmt test36.cpp 97:70 - operand
+    call_expr test36.cpp 97:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNonNullVars - operand
+       - stringLength: 17
+     nop_expr - arg
+      addr_expr - operand
+       string_cst this->tmp1 - operand
+       - stringLength: 11
+  cleanup_point_expr test36.cpp 98:57 - statement
+   expr_stmt test36.cpp 98:57 - operand
+    call_expr test36.cpp 98:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNullVars - operand
+       - stringLength: 14
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test36.cpp 99:61 - statement
+   expr_stmt test36.cpp 99:61 - operand
+    call_expr test36.cpp 99:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst needCheckNullVars - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test36.cpp 100:55 - statement
+   expr_stmt test36.cpp 100:55 - operand
+    call_expr test36.cpp 100:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst addNullVars - operand
+       - stringLength: 12
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test36.cpp 101:61 - statement
+   expr_stmt test36.cpp 101:61 - operand
+    call_expr test36.cpp 101:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst removeNullVarsAll - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test36.cpp 102:58 - statement
+   expr_stmt test36.cpp 102:58 - operand
+    call_expr test36.cpp 102:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst linkedVars - operand
+       - stringLength: 11
+     nop_expr - arg
+      addr_expr - operand
+       string_cst ptr1 - operand
+       - stringLength: 5
+  cleanup_point_expr test36.cpp 103:64 - statement
+   expr_stmt test36.cpp 103:64 - operand
+    call_expr test36.cpp 103:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst linkedVars - operand
+       - stringLength: 11
+     nop_expr - arg
+      addr_expr - operand
+       string_cst this->tmp1 - operand
+       - stringLength: 11
+  cleanup_point_expr test36.cpp 104:65 - statement
+   expr_stmt test36.cpp 104:65 - operand
+    call_expr test36.cpp 104:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst linkedReverseVars - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst ptr1 - operand
+       - stringLength: 5
+  cleanup_point_expr test36.cpp 105:71 - statement
+   expr_stmt test36.cpp 105:71 - operand
+    call_expr test36.cpp 105:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+        void_type - function return type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst linkedReverseVars - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst this->tmp1 - operand
+       - stringLength: 11
+function_decl Data2 test36.cpp 14:8
+- isAutogenerated: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 14:8 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 14:8 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test36.cpp 14:8 - code
+  cleanup_point_expr test36.cpp 14:8 - operand
+   expr_stmt test36.cpp 14:8 - operand
+    convert_expr - expresssion
+     modify_expr - operand
+      component_ref - operand
+       indirect_ref - object
+        nop_expr - ref
+         parm_decl this test36.cpp 14:8 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data2 test36.cpp 14:8 - type name
+            - isAutogenerated: 1
+            field_decl _vptr.Data2 test36.cpp 14:8 - field
+            - unsigned
+            - isVirtual: 1
+            - isAutogenerated: 1
+             integer_cst 64 - decl size
+            field_decl val test36.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test36.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test36.cpp 18:14 - field
+            - signed
+             integer_cst 96 - decl size
+            type_decl Data2 test36.cpp 15:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl _vptr.Data2 test36.cpp 14:8 - field
+       - unsigned
+       - isVirtual: 1
+       - isAutogenerated: 1
+        integer_cst 64 - decl size
+      pointer_plus_expr - operand
+       addr_expr - operand
+        var_decl _ZTV5Data2 test36.cpp 14:8 - operand
+        - isUsed: 1
+        - isVirtual: 1
+        - isAutogenerated: 1
+         integer_cst 256 - decl size
+         constructor - initial
+          array_type - constructor type
+           pointer_type - element type
+            type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+            - isAutogenerated: 1
+            function_type - nested type
+             integer_type - function return type
+             - precisionBits: 32
+             - signed
+              type_decl int <built-in> 0:0 - type name
+              - isAutogenerated: 1
+              integer_cst 32 - type size
+              integer_cst -2147483648 - min value
+              integer_cst 2147483647 - max value
+           integer_type - domain
+           - precisionBits: 64
+           - signed
+            integer_cst 64 - type size
+            integer_cst 0 - min value
+            integer_cst 3 - max value
+          nop_expr - value
+           integer_cst 0 - operand
+          nop_expr - value
+           addr_expr - operand
+            var_decl _ZTI5Data2 test36.cpp 14:8 - operand
+            - isAutogenerated: 1
+             integer_cst 128 - decl size
+             record_type - var type
+              type_decl __class_type_info_pseudo <built-in> 0:0 - type name
+              field_decl <built-in> 0:0 - field
+              - signed
+               integer_cst 128 - decl size
+          nop_expr - value
+           addr_expr - operand
+            function_decl __comp_dtor  test36.cpp 19:13 - operand
+            - isVirtual: 1
+            - isPublic: 1
+             method_type - function type
+              void_type - method return type
+          nop_expr - value
+           addr_expr - operand
+            function_decl __deleting_dtor  test36.cpp 19:13 - operand
+            - isVirtual: 1
+            - isPublic: 1
+             method_type - function type
+              void_type - method return type
+         array_type - var type
+          pointer_type - element type
+           type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+           - isAutogenerated: 1
+           function_type - nested type
+            integer_type - function return type
+            - precisionBits: 32
+            - signed
+             type_decl int <built-in> 0:0 - type name
              - isAutogenerated: 1
-             field_decl tmp1 test36.cpp 24:12 - field
-             - unsigned
-              integer_cst 64 - decl size
-             field_decl tmp2 test36.cpp 25:12 - field
-             - unsigned
-              integer_cst 64 - decl size
-             type_decl Object1 test36.cpp 23:1 - field
+             integer_cst 32 - type size
+             integer_cst -2147483648 - min value
+             integer_cst 2147483647 - max value
+          integer_type - domain
+          - precisionBits: 64
+          - signed
+           integer_cst 64 - type size
+           integer_cst 0 - min value
+           integer_cst 3 - max value
+       integer_cst 16 - operand
+  block - operand
+function_decl __base_ctor  test36.cpp 14:8
+- isAutogenerated: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 14:8 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 14:8 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test36.cpp 14:8 - code
+  cleanup_point_expr test36.cpp 14:8 - operand
+   expr_stmt test36.cpp 14:8 - operand
+    convert_expr - expresssion
+     modify_expr - operand
+      component_ref - operand
+       indirect_ref - object
+        nop_expr - ref
+         parm_decl this test36.cpp 14:8 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data2 test36.cpp 14:8 - type name
+            - isAutogenerated: 1
+            field_decl _vptr.Data2 test36.cpp 14:8 - field
+            - unsigned
+            - isVirtual: 1
+            - isAutogenerated: 1
+             integer_cst 64 - decl size
+            field_decl val test36.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test36.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test36.cpp 18:14 - field
+            - signed
+             integer_cst 96 - decl size
+            type_decl Data2 test36.cpp 15:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl _vptr.Data2 test36.cpp 14:8 - field
+       - unsigned
+       - isVirtual: 1
+       - isAutogenerated: 1
+        integer_cst 64 - decl size
+      pointer_plus_expr - operand
+       addr_expr - operand
+        var_decl _ZTV5Data2 test36.cpp 14:8 - operand
+        - isUsed: 1
+        - isVirtual: 1
+        - isAutogenerated: 1
+         integer_cst 256 - decl size
+         constructor - initial
+          array_type - constructor type
+           pointer_type - element type
+            type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+            - isAutogenerated: 1
+            function_type - nested type
+             integer_type - function return type
+             - precisionBits: 32
+             - signed
+              type_decl int <built-in> 0:0 - type name
+              - isAutogenerated: 1
+              integer_cst 32 - type size
+              integer_cst -2147483648 - min value
+              integer_cst 2147483647 - max value
+           integer_type - domain
+           - precisionBits: 64
+           - signed
+            integer_cst 64 - type size
+            integer_cst 0 - min value
+            integer_cst 3 - max value
+          nop_expr - value
+           integer_cst 0 - operand
+          nop_expr - value
+           addr_expr - operand
+            var_decl _ZTI5Data2 test36.cpp 14:8 - operand
+            - isAutogenerated: 1
+             integer_cst 128 - decl size
+             record_type - var type
+              type_decl __class_type_info_pseudo <built-in> 0:0 - type name
+              field_decl <built-in> 0:0 - field
+              - signed
+               integer_cst 128 - decl size
+          nop_expr - value
+           addr_expr - operand
+            function_decl __comp_dtor  test36.cpp 19:13 - operand
+            - isVirtual: 1
+            - isPublic: 1
+             method_type - function type
+              void_type - method return type
+          nop_expr - value
+           addr_expr - operand
+            function_decl __deleting_dtor  test36.cpp 19:13 - operand
+            - isVirtual: 1
+            - isPublic: 1
+             method_type - function type
+              void_type - method return type
+         array_type - var type
+          pointer_type - element type
+           type_decl __vtbl_ptr_type <built-in> 0:0 - type name
+           - isAutogenerated: 1
+           function_type - nested type
+            integer_type - function return type
+            - precisionBits: 32
+            - signed
+             type_decl int <built-in> 0:0 - type name
              - isAutogenerated: 1
-           integer_cst 64 - parm size
-        field_decl tmp1 test36.cpp 24:12 - field
-        - unsigned
-         integer_cst 64 - decl size
-       nop_expr - operand
-        nop_expr - operand
-         call_expr test36.cpp 87:24 - operand
+             integer_cst 32 - type size
+             integer_cst -2147483648 - min value
+             integer_cst 2147483647 - max value
+          integer_type - domain
+          - precisionBits: 64
+          - signed
+           integer_cst 64 - type size
+           integer_cst 0 - min value
+           integer_cst 3 - max value
+       integer_cst 16 - operand
+  block - operand
+function_decl __comp_ctor  test36.cpp 14:8
+- isAutogenerated: 1
+- 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 Data2 test36.cpp 14:8 - type name
+   - isAutogenerated: 1
+   field_decl _vptr.Data2 test36.cpp 14:8 - field
+   - unsigned
+   - isVirtual: 1
+   - isAutogenerated: 1
+    integer_cst 64 - decl size
+   field_decl val test36.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test36.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl arr test36.cpp 18:14 - field
+   - signed
+    integer_cst 96 - decl size
+   type_decl Data2 test36.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data2 test36.cpp 14:8 - type name
+     - isAutogenerated: 1
+     field_decl _vptr.Data2 test36.cpp 14:8 - field
+     - unsigned
+     - isVirtual: 1
+     - isAutogenerated: 1
+      integer_cst 64 - decl size
+     field_decl val test36.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test36.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl arr test36.cpp 18:14 - field
+     - signed
+      integer_cst 96 - decl size
+     type_decl Data2 test36.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 14:8 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test36.cpp 14:8 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data2 test36.cpp 14:8 - type name
+    - isAutogenerated: 1
+    field_decl _vptr.Data2 test36.cpp 14:8 - field
+    - unsigned
+    - isVirtual: 1
+    - isAutogenerated: 1
+     integer_cst 64 - decl size
+    field_decl val test36.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test36.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test36.cpp 18:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data2 test36.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl func5 test36.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 test36.cpp 32:7 - type name
+   - isAutogenerated: 1
+   field_decl tmp1 test36.cpp 34:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test36.cpp 35:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp3 test36.cpp 36:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test36.cpp 33:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test36.cpp 32:7 - type name
+     - isAutogenerated: 1
+     field_decl tmp1 test36.cpp 34:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp2 test36.cpp 35:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp3 test36.cpp 36:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test36.cpp 33:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    void_type - value
+     type_decl void <built-in> 0:0 - type name
+     - isAutogenerated: 1
+ result_decl test36.cpp 109: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 test36.cpp 108:16 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test36.cpp 32:7 - type name
+    - isAutogenerated: 1
+    field_decl tmp1 test36.cpp 34:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test36.cpp 35:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp3 test36.cpp 36:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test36.cpp 33:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+  cleanup_point_expr test36.cpp 110:25 - statement
+   expr_stmt test36.cpp 110:25 - operand
+    convert_expr - expresssion
+     modify_expr - operand
+      component_ref test36.cpp 110:9 - operand
+       indirect_ref - object
+        nop_expr - ref
+         - isUsed: 1
+         parm_decl this test36.cpp 108:16 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Object1 test36.cpp 32:7 - type name
+            - isAutogenerated: 1
+            field_decl tmp1 test36.cpp 34:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl tmp2 test36.cpp 35:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl tmp3 test36.cpp 36:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Object1 test36.cpp 33:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl tmp3 test36.cpp 36:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+      nop_expr - operand
+       compound_expr - operand
+        target_expr - operand
+         var_decl test36.cpp 110:20 - operand
+         - isAutogenerated: 1
+          integer_cst 64 - decl size
+          pointer_type - var type
+           void_type - nested type
+            type_decl void <built-in> 0:0 - type name
+            - isAutogenerated: 1
+         call_expr test36.cpp 110:20 - operand
           addr_expr - function
            function_decl operator new <built-in> 0:0 - operand
            - isAutogenerated: 1
@@ -1451,12 +3218,39 @@ function_decl func4 test36.cpp 82:10
                integer_cst 1 - value
               tree_list - chain
                identifier_node externally_visible - purpose
-          integer_cst 32 - arg
-  cleanup_point_expr test36.cpp 88:63 - statement
-   expr_stmt test36.cpp 88:63 - operand
-    call_expr test36.cpp 88:31 - expresssion
+          integer_cst 40 - arg
+        compound_expr - operand
+         try_catch_expr - operand
+          call_expr test36.cpp 110:20 - operand
+           addr_expr - function
+            function_decl __comp_ctor  test36.cpp 14:8 - operand
+            - isAutogenerated: 1
+            - isPublic: 1
+             method_type - function type
+              void_type - method return type
+           nop_expr - arg
+            var_decl test36.cpp 110:20 - operand
+            - isAutogenerated: 1
+          call_expr test36.cpp 110:20 - operand
+           addr_expr - function
+            function_decl operator delete <built-in> 0:0 - operand
+            - isAutogenerated: 1
+            - isExternal: 1
+            - isPublic: 1
+             function_type - function type
+              void_type - function return type
+              tree_list - attribute
+               identifier_node externally_visible - purpose
+           var_decl test36.cpp 110:20 - arg
+           - isAutogenerated: 1
+         nop_expr - operand
+          var_decl test36.cpp 110:20 - operand
+          - isAutogenerated: 1
+  cleanup_point_expr test36.cpp 111:63 - statement
+   expr_stmt test36.cpp 111:63 - operand
+    call_expr test36.cpp 111:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1471,13 +3265,13 @@ function_decl func4 test36.cpp 82:10
        - stringLength: 10
      nop_expr - arg
       addr_expr - operand
-       string_cst this->tmp1 - operand
+       string_cst this->tmp3 - operand
        - stringLength: 11
-  cleanup_point_expr test36.cpp 89:70 - statement
-   expr_stmt test36.cpp 89:70 - operand
-    call_expr test36.cpp 89:31 - expresssion
+  cleanup_point_expr test36.cpp 112:70 - statement
+   expr_stmt test36.cpp 112:70 - operand
+    call_expr test36.cpp 112:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1492,13 +3286,13 @@ function_decl func4 test36.cpp 82:10
        - stringLength: 17
      nop_expr - arg
       addr_expr - operand
-       string_cst this->tmp1 - operand
+       string_cst this->tmp3 - operand
        - stringLength: 11
-  cleanup_point_expr test36.cpp 90:57 - statement
-   expr_stmt test36.cpp 90:57 - operand
-    call_expr test36.cpp 90:31 - expresssion
+  cleanup_point_expr test36.cpp 113:57 - statement
+   expr_stmt test36.cpp 113:57 - operand
+    call_expr test36.cpp 113:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1515,11 +3309,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst - operand
        - stringLength: 1
-  cleanup_point_expr test36.cpp 91:61 - statement
-   expr_stmt test36.cpp 91:61 - operand
-    call_expr test36.cpp 91:31 - expresssion
+  cleanup_point_expr test36.cpp 114:61 - statement
+   expr_stmt test36.cpp 114:61 - operand
+    call_expr test36.cpp 114:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1536,11 +3330,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst - operand
        - stringLength: 1
-  cleanup_point_expr test36.cpp 92:55 - statement
-   expr_stmt test36.cpp 92:55 - operand
-    call_expr test36.cpp 92:31 - expresssion
+  cleanup_point_expr test36.cpp 115:55 - statement
+   expr_stmt test36.cpp 115:55 - operand
+    call_expr test36.cpp 115:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1557,11 +3351,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst - operand
        - stringLength: 1
-  cleanup_point_expr test36.cpp 93:61 - statement
-   expr_stmt test36.cpp 93:61 - operand
-    call_expr test36.cpp 93:31 - expresssion
+  cleanup_point_expr test36.cpp 116:61 - statement
+   expr_stmt test36.cpp 116:61 - operand
+    call_expr test36.cpp 116:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1578,11 +3372,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst - operand
        - stringLength: 1
-  cleanup_point_expr test36.cpp 94:58 - statement
-   expr_stmt test36.cpp 94:58 - operand
-    call_expr test36.cpp 94:31 - expresssion
+  cleanup_point_expr test36.cpp 117:58 - statement
+   expr_stmt test36.cpp 117:58 - operand
+    call_expr test36.cpp 117:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1599,11 +3393,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst ptr1 - operand
        - stringLength: 5
-  cleanup_point_expr test36.cpp 95:64 - statement
-   expr_stmt test36.cpp 95:64 - operand
-    call_expr test36.cpp 95:31 - expresssion
+  cleanup_point_expr test36.cpp 118:64 - statement
+   expr_stmt test36.cpp 118:64 - operand
+    call_expr test36.cpp 118:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1618,13 +3412,13 @@ function_decl func4 test36.cpp 82:10
        - stringLength: 11
      nop_expr - arg
       addr_expr - operand
-       string_cst this->tmp1 - operand
+       string_cst this->tmp3 - operand
        - stringLength: 11
-  cleanup_point_expr test36.cpp 96:65 - statement
-   expr_stmt test36.cpp 96:65 - operand
-    call_expr test36.cpp 96:31 - expresssion
+  cleanup_point_expr test36.cpp 119:65 - statement
+   expr_stmt test36.cpp 119:65 - operand
+    call_expr test36.cpp 119:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1641,11 +3435,11 @@ function_decl func4 test36.cpp 82:10
       addr_expr - operand
        string_cst ptr1 - operand
        - stringLength: 5
-  cleanup_point_expr test36.cpp 97:71 - statement
-   expr_stmt test36.cpp 97:71 - operand
-    call_expr test36.cpp 97:31 - expresssion
+  cleanup_point_expr test36.cpp 120:71 - statement
+   expr_stmt test36.cpp 120:71 - operand
+    call_expr test36.cpp 120:31 - expresssion
      addr_expr - function
-      function_decl paranuckerInternalTest test36.cpp 20:6 - operand
+      function_decl paranuckerInternalTest test36.cpp 30:6 - operand
       - isExternal: 1
       - isPublic: 1
        function_type - function type
@@ -1660,5 +3454,5 @@ function_decl func4 test36.cpp 82:10
        - stringLength: 18
      nop_expr - arg
       addr_expr - operand
-       string_cst this->tmp1 - operand
+       string_cst this->tmp3 - operand
        - stringLength: 11
diff --git a/test/test36-02.txt b/test/test36-02.txt
index 3e1c74d..d55b120 100644
--- a/test/test36-02.txt
+++ b/test/test36-02.txt
@@ -1,7 +1,16 @@
 getData3: 
+Data2: 
+__base_dtor : 
+__comp_dtor : 
+__deleting_dtor : 
+getData3: 
 getData1: 
 getData2: 
 func1: 
 func2: 
 func3: 
 func4: 
+Data2: 
+__base_ctor : 
+__comp_ctor : 
+func5: 
diff --git a/test/test36-03.txt b/test/test36-03.txt
index 96315f1..a0b1d8c 100644
--- a/test/test36-03.txt
+++ b/test/test36-03.txt
@@ -29,6 +29,340 @@ type_decl Data1:
 integer_cst 64: 
 field_decl ptrval: 
 integer_cst 64: 
+function_decl Data2: 
+must_not_throw_expr : 
+statement_list : 
+bind_expr : 
+statement_list : 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+modify_expr : 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+pointer_plus_expr : 
+addr_expr : 
+var_decl _ZTV5Data2: 
+integer_cst 256: 
+constructor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 0: 
+addr_expr : 
+var_decl _ZTI5Data2: 
+integer_cst 128: 
+record_type : 
+type_decl __class_type_info_pseudo: 
+field_decl : 
+integer_cst 128: 
+addr_expr : 
+function_decl __comp_dtor : 
+addr_expr : 
+function_decl __deleting_dtor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 16: 
+cleanup_stmt : 
+statement_list : 
+modify_expr : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+constructor : 
+record_type : 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+block : 
+label_expr : 
+label_decl : 
+if_stmt : 
+ne_expr : 
+bit_and_expr : 
+parm_decl __in_chrg: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_cst 32: 
+integer_cst 1: 
+integer_cst 0: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl operator delete: 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+function_decl __base_dtor : 
+must_not_throw_expr : 
+statement_list : 
+bind_expr : 
+statement_list : 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+modify_expr : 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+pointer_plus_expr : 
+addr_expr : 
+var_decl _ZTV5Data2: 
+integer_cst 256: 
+constructor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 0: 
+addr_expr : 
+var_decl _ZTI5Data2: 
+integer_cst 128: 
+record_type : 
+type_decl __class_type_info_pseudo: 
+field_decl : 
+integer_cst 128: 
+addr_expr : 
+function_decl __comp_dtor : 
+addr_expr : 
+function_decl __deleting_dtor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 16: 
+try_finally : 
+statement_list : 
+modify_expr : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+constructor : 
+record_type : 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+block : 
+label_expr : 
+label_decl : 
+cond_expr : 
+ne_expr : 
+bit_and_expr : 
+integer_cst 0: 
+integer_cst 1: 
+integer_cst 0: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl operator delete: 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+integer_cst 0: 
+function_decl __comp_dtor : 
+statement_list : 
+function_decl __deleting_dtor : 
+statement_list : 
+call_expr : 
+addr_expr : 
+function_decl __comp_dtor : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+label_expr : 
+label_decl : 
+call_expr : 
+addr_expr : 
+function_decl operator delete: 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+function_decl getData3: 
+return_expr : 
+init_expr : 
+result_decl : 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data1: 
+integer_cst 64: 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+field_decl ptrval: 
+integer_cst 64: 
 function_decl getData1: 
 return_expr : 
 init_expr : 
@@ -54,6 +388,8 @@ field_decl tmp1:
 integer_cst 64: 
 field_decl tmp2: 
 integer_cst 64: 
+field_decl tmp3: 
+integer_cst 64: 
 type_decl Object1: 
 integer_cst 64: 
 field_decl tmp2: 
@@ -83,6 +419,8 @@ field_decl tmp1:
 integer_cst 64: 
 field_decl tmp2: 
 integer_cst 64: 
+field_decl tmp3: 
+integer_cst 64: 
 type_decl Object1: 
 integer_cst 64: 
 field_decl tmp2: 
@@ -319,16 +657,6 @@ block :
 var_decl ptr1: 
 function_decl func4: 
 statement_list : 
-if_stmt : 
-eq_expr : 
-var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 cleanup_point_expr : 
 expr_stmt : 
 convert_expr : 
@@ -343,6 +671,8 @@ field_decl tmp1:
 integer_cst 64: 
 field_decl tmp2: 
 integer_cst 64: 
+field_decl tmp3: 
+integer_cst 64: 
 type_decl Object1: 
 integer_cst 64: 
 field_decl tmp1: 
@@ -353,6 +683,198 @@ function_decl operator new:
 integer_cst 32: 
 cleanup_point_expr : 
 expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+function_decl Data2: 
+bind_expr : 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+modify_expr : 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+pointer_plus_expr : 
+addr_expr : 
+var_decl _ZTV5Data2: 
+integer_cst 256: 
+constructor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 0: 
+addr_expr : 
+var_decl _ZTI5Data2: 
+integer_cst 128: 
+record_type : 
+type_decl __class_type_info_pseudo: 
+field_decl : 
+integer_cst 128: 
+addr_expr : 
+function_decl __comp_dtor : 
+addr_expr : 
+function_decl __deleting_dtor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 16: 
+block : 
+function_decl __base_ctor : 
+bind_expr : 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+modify_expr : 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Data2: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data2: 
+integer_cst 64: 
+field_decl _vptr.Data2: 
+integer_cst 64: 
+pointer_plus_expr : 
+addr_expr : 
+var_decl _ZTV5Data2: 
+integer_cst 256: 
+constructor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 0: 
+addr_expr : 
+var_decl _ZTI5Data2: 
+integer_cst 128: 
+record_type : 
+type_decl __class_type_info_pseudo: 
+field_decl : 
+integer_cst 128: 
+addr_expr : 
+function_decl __comp_dtor : 
+addr_expr : 
+function_decl __deleting_dtor : 
+array_type : 
+pointer_type : 
+type_decl __vtbl_ptr_type: 
+function_type : 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+integer_type : 
+integer_cst 64: 
+integer_cst 0: 
+integer_cst 3: 
+integer_cst 16: 
+block : 
+function_decl __comp_ctor : 
+statement_list : 
+function_decl func5: 
+statement_list : 
+cleanup_point_expr : 
+expr_stmt : 
 convert_expr : 
 modify_expr : 
 component_ref : 
@@ -365,14 +887,34 @@ field_decl tmp1:
 integer_cst 64: 
 field_decl tmp2: 
 integer_cst 64: 
+field_decl tmp3: 
+integer_cst 64: 
 type_decl Object1: 
 integer_cst 64: 
-field_decl tmp1: 
+field_decl tmp3: 
 integer_cst 64: 
+compound_expr : 
+target_expr : 
+var_decl : 
+integer_cst 64: 
+pointer_type : 
+void_type : 
+type_decl void: 
 call_expr : 
 addr_expr : 
 function_decl operator new: 
-integer_cst 32: 
+integer_cst 40: 
+compound_expr : 
+try_catch_expr : 
+call_expr : 
+addr_expr : 
+function_decl __comp_ctor : 
+var_decl : 
+call_expr : 
+addr_expr : 
+function_decl operator delete: 
+var_decl : 
+var_decl : 
 cleanup_point_expr : 
 expr_stmt : 
 call_expr : 
diff --git a/test/test36-05.txt b/test/test36-05.txt
index 3c4777d..111819c 100644
--- a/test/test36-05.txt
+++ b/test/test36-05.txt
@@ -1,12 +1,12 @@
 test36.cpp: In member function 'void Object1::func1()':
-test36.cpp:39:16: warning: unused variable 'ptr1' [-Wunused-variable]
+test36.cpp:50:16: warning: unused variable 'ptr1' [-Wunused-variable]
          Data1 *ptr1 = new Data1;
                 ^
 test36.cpp: In member function 'void Object1::func2()':
-test36.cpp:54:16: warning: unused variable 'ptr1' [-Wunused-variable]
+test36.cpp:65:16: warning: unused variable 'ptr1' [-Wunused-variable]
          Data1 *ptr1 = new Data1[10];
                 ^
 test36.cpp: In member function 'void Object1::func3()':
-test36.cpp:69:14: warning: unused variable 'ptr1' [-Wunused-variable]
+test36.cpp:80:14: warning: unused variable 'ptr1' [-Wunused-variable]
          int *ptr1 = new int[10];
               ^
diff --git a/test/test36.cpp b/test/test36.cpp
index ecc52f5..632f7c3 100644
--- a/test/test36.cpp
+++ b/test/test36.cpp
@@ -11,8 +11,18 @@ struct Data1
     }
 };
 
-struct Data2 : public Data1
+struct Data2
 {
+    int val;
+    Data1 *ptrval;
+    int arr[3];
+    virtual ~Data2()
+    {
+    }
+    Data1 *getData3()
+    {
+        return ptrval;
+    }
 };
 
 int k;
@@ -23,6 +33,7 @@ class Object1
 {
     Data1 *tmp1;
     Data1 *tmp2;
+    Data2 *tmp3;
 
     Data1 *getData1()
     {
@@ -93,4 +104,19 @@ class Object1
         paranuckerInternalTest("=", "linkedReverseVars", "ptr1");
         paranuckerInternalTest("=", "linkedReverseVars", "this->tmp1");
     }
+
+    void func5()
+    {
+        tmp3 = new Data2;
+        paranuckerInternalTest("=", "knownVars", "this->tmp3");
+        paranuckerInternalTest("=", "knownNonNullVars", "this->tmp3");
+        paranuckerInternalTest("=", "knownNullVars", "");
+        paranuckerInternalTest("=", "needCheckNullVars", "");
+        paranuckerInternalTest("=", "addNullVars", "");
+        paranuckerInternalTest("=", "removeNullVarsAll", "");
+        paranuckerInternalTest("=", "linkedVars", "ptr1");
+        paranuckerInternalTest("=", "linkedVars", "this->tmp3");
+        paranuckerInternalTest("=", "linkedReverseVars", "ptr1");
+        paranuckerInternalTest("=", "linkedReverseVars", "this->tmp3");
+    }
 };