Update test 42 and 43.

12 files changed, 749 insertions, 258 deletions

diff --git a/test/test42-01.txt b/test/test42-01.txt
index c60d076..6b6a511 100644
--- a/test/test42-01.txt
+++ b/test/test42-01.txt
@@ -379,7 +379,7 @@ function_decl getData6 test42.cpp 41:20 2147483647
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
    integer_cst 0 2147483644 - operand
-function_decl getData1 test42.cpp 60:12 2147483647
+function_decl getData1 test42.cpp 62:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -398,7 +398,7 @@ function_decl getData1 test42.cpp 60:12 2147483647
     void_type 2147483643 - value
      type_decl void <built-in> 0:0 2147483642 - type name
      - isAutogenerated: 1
- result_decl test42.cpp 61:5 2147483646 - function result
+ result_decl test42.cpp 63:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -406,27 +406,27 @@ function_decl getData1 test42.cpp 60:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test42.cpp 60:21 2147483646 - argument
+ parm_decl this test42.cpp 62:21 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test42.cpp 62:16 2147483646 - code
+ return_expr test42.cpp 64:16 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test42.cpp 61:5 2147483644 - operand
+   result_decl test42.cpp 63:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
       type_decl Data1 test42.cpp 15:8 2 - type name
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
-   component_ref test42.cpp 62:16 2147483644 - operand
+   component_ref test42.cpp 64:16 2147483644 - operand
     indirect_ref 2147483643 - object
      nop_expr 2147483642 - ref
       - isUsed: 1
-      parm_decl this test42.cpp 60:21 2147483641 - operand
+      parm_decl this test42.cpp 62:21 2147483641 - operand
       - isAutogenerated: 1
        pointer_type 2147483640 - decl type
         record_type 3 - nested type
@@ -440,7 +440,7 @@ function_decl getData1 test42.cpp 60:12 2147483647
       record_type 3 - nested type
        type_decl Data1 test42.cpp 15:8 2 - type name
        - isAutogenerated: 1
-function_decl getData2 test42.cpp 65:12 2147483647
+function_decl getData2 test42.cpp 67:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -459,7 +459,7 @@ function_decl getData2 test42.cpp 65:12 2147483647
     void_type 2147483643 - value
      type_decl void <built-in> 0:0 2147483642 - type name
      - isAutogenerated: 1
- result_decl test42.cpp 66:5 2147483646 - function result
+ result_decl test42.cpp 68:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -467,27 +467,27 @@ function_decl getData2 test42.cpp 65:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test42.cpp 65:21 2147483646 - argument
+ parm_decl this test42.cpp 67:21 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test42.cpp 67:16 2147483646 - code
+ return_expr test42.cpp 69:16 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test42.cpp 66:5 2147483644 - operand
+   result_decl test42.cpp 68:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
       type_decl Data1 test42.cpp 15:8 2 - type name
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
-   component_ref test42.cpp 67:16 2147483644 - operand
+   component_ref test42.cpp 69:16 2147483644 - operand
     indirect_ref 2147483643 - object
      nop_expr 2147483642 - ref
       - isUsed: 1
-      parm_decl this test42.cpp 65:21 2147483641 - operand
+      parm_decl this test42.cpp 67:21 2147483641 - operand
       - isAutogenerated: 1
        pointer_type 2147483640 - decl type
         record_type 3 - nested type
@@ -501,7 +501,7 @@ function_decl getData2 test42.cpp 65:12 2147483647
       record_type 3 - nested type
        type_decl Data1 test42.cpp 15:8 2 - type name
        - isAutogenerated: 1
-function_decl func1 test42.cpp 70:10 2147483647
+function_decl func1 test42.cpp 72:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -524,37 +524,37 @@ function_decl func1 test42.cpp 70:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 71:5 2147483646 - function result
+ result_decl test42.cpp 73:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 70:29 2147483646 - argument
+ parm_decl this test42.cpp 72:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 70:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 72:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 72:24 2147483646 - code
-  expr_stmt test42.cpp 72:24 2147483645 - operand
+ cleanup_point_expr test42.cpp 74:24 2147483646 - code
+  expr_stmt test42.cpp 74:24 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 72:15 2147483642 - operand
+     component_ref test42.cpp 74:15 2147483642 - operand
       indirect_ref 2147483641 - object
        nop_expr 2147483640 - ref
-        component_ref test42.cpp 72:9 2147483639 - operand
+        component_ref test42.cpp 74:9 2147483639 - operand
          indirect_ref 2147483638 - object
           nop_expr 2147483637 - ref
            - isUsed: 1
-           parm_decl this test42.cpp 70:29 2147483636 - operand
+           parm_decl this test42.cpp 72:29 2147483636 - operand
            - isAutogenerated: 1
             pointer_type 2147483635 - decl type
              record_type 3 - nested type
@@ -580,7 +580,7 @@ function_decl func1 test42.cpp 70:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func2 test42.cpp 75:10 2147483647
+function_decl func2 test42.cpp 77:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -603,37 +603,37 @@ function_decl func2 test42.cpp 75:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 76:5 2147483646 - function result
+ result_decl test42.cpp 78:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 75:29 2147483646 - argument
+ parm_decl this test42.cpp 77:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 75:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 77:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 77:24 2147483646 - code
-  expr_stmt test42.cpp 77:24 2147483645 - operand
+ cleanup_point_expr test42.cpp 79:24 2147483646 - code
+  expr_stmt test42.cpp 79:24 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 77:15 2147483642 - operand
+     component_ref test42.cpp 79:15 2147483642 - operand
       indirect_ref 2147483641 - object
        nop_expr 2147483640 - ref
-        component_ref test42.cpp 77:9 2147483639 - operand
+        component_ref test42.cpp 79:9 2147483639 - operand
          indirect_ref 2147483638 - object
           nop_expr 2147483637 - ref
            - isUsed: 1
-           parm_decl this test42.cpp 75:29 2147483636 - operand
+           parm_decl this test42.cpp 77:29 2147483636 - operand
            - isAutogenerated: 1
             pointer_type 2147483635 - decl type
              record_type 3 - nested type
@@ -661,7 +661,7 @@ function_decl func2 test42.cpp 75:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func3 test42.cpp 80:10 2147483647
+function_decl func3 test42.cpp 82:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -684,29 +684,29 @@ function_decl func3 test42.cpp 80:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 81:5 2147483646 - function result
+ result_decl test42.cpp 83:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 80:29 2147483646 - argument
+ parm_decl this test42.cpp 82:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 80:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 82:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 82:25 2147483646 - code
-  expr_stmt test42.cpp 82:25 2147483645 - operand
+ cleanup_point_expr test42.cpp 84:25 2147483646 - code
+  expr_stmt test42.cpp 84:25 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 82:16 2147483642 - operand
+     component_ref test42.cpp 84:16 2147483642 - operand
       indirect_ref 2147483641 - object
        var_decl gptr1 test42.cpp 49:8 2147483640 - ref
        - isUsed: 1
@@ -727,7 +727,7 @@ function_decl func3 test42.cpp 80:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func4 test42.cpp 85:10 2147483647
+function_decl func4 test42.cpp 87:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -750,29 +750,29 @@ function_decl func4 test42.cpp 85:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 86:5 2147483646 - function result
+ result_decl test42.cpp 88:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 85:29 2147483646 - argument
+ parm_decl this test42.cpp 87:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 85:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 87:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 87:25 2147483646 - code
-  expr_stmt test42.cpp 87:25 2147483645 - operand
+ cleanup_point_expr test42.cpp 89:25 2147483646 - code
+  expr_stmt test42.cpp 89:25 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 87:16 2147483642 - operand
+     component_ref test42.cpp 89:16 2147483642 - operand
       indirect_ref 2147483641 - object
        var_decl gptr2 test42.cpp 50:8 2147483640 - ref
        - isUsed: 1
@@ -795,7 +795,7 @@ function_decl func4 test42.cpp 85:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func5 test42.cpp 90:10 2147483647
+function_decl func5 test42.cpp 92:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -818,29 +818,29 @@ function_decl func5 test42.cpp 90:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 91:5 2147483646 - function result
+ result_decl test42.cpp 93:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 90:29 2147483646 - argument
+ parm_decl this test42.cpp 92:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 90:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 92:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 92:25 2147483646 - code
-  expr_stmt test42.cpp 92:25 2147483645 - operand
+ cleanup_point_expr test42.cpp 94:25 2147483646 - code
+  expr_stmt test42.cpp 94:25 2147483645 - operand
    convert_expr 2147483644 - expresssion
-    call_expr test42.cpp 92:23 2147483643 - operand
+    call_expr test42.cpp 94:23 2147483643 - operand
      addr_expr 2147483642 - function
       function_decl getData2 test42.cpp 23:12 20 - operand
       - isExternal: 1
@@ -905,11 +905,11 @@ function_decl func5 test42.cpp 90:10 2147483647
              type_decl Data1 test42.cpp 15:8 2 - type name
              - isAutogenerated: 1
      nop_expr 2147483642 - arg
-      component_ref test42.cpp 92:9 2147483641 - operand
+      component_ref test42.cpp 94:9 2147483641 - operand
        indirect_ref 2147483640 - object
         nop_expr 2147483639 - ref
          - isUsed: 1
-         parm_decl this test42.cpp 90:29 2147483638 - operand
+         parm_decl this test42.cpp 92:29 2147483638 - operand
          - isAutogenerated: 1
           pointer_type 2147483637 - decl type
            record_type 3 - nested type
@@ -923,7 +923,7 @@ function_decl func5 test42.cpp 90:10 2147483647
          record_type 3 - nested type
           type_decl Data1 test42.cpp 15:8 2 - type name
           - isAutogenerated: 1
-function_decl func6 test42.cpp 95:10 2147483647
+function_decl func6 test42.cpp 97:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -946,29 +946,29 @@ function_decl func6 test42.cpp 95:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 96:5 2147483646 - function result
+ result_decl test42.cpp 98:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 95:29 2147483646 - argument
+ parm_decl this test42.cpp 97:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 95:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 97:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 97:25 2147483646 - code
-  expr_stmt test42.cpp 97:25 2147483645 - operand
+ cleanup_point_expr test42.cpp 99:25 2147483646 - code
+  expr_stmt test42.cpp 99:25 2147483645 - operand
    convert_expr 2147483644 - expresssion
-    call_expr test42.cpp 97:23 2147483643 - operand
+    call_expr test42.cpp 99:23 2147483643 - operand
      addr_expr 2147483642 - function
       function_decl getData2 test42.cpp 23:12 20 - operand
       - isExternal: 1
@@ -1033,11 +1033,11 @@ function_decl func6 test42.cpp 95:10 2147483647
              type_decl Data1 test42.cpp 15:8 2 - type name
              - isAutogenerated: 1
      nop_expr 2147483642 - arg
-      component_ref test42.cpp 97:9 2147483641 - operand
+      component_ref test42.cpp 99:9 2147483641 - operand
        indirect_ref 2147483640 - object
         nop_expr 2147483639 - ref
          - isUsed: 1
-         parm_decl this test42.cpp 95:29 2147483638 - operand
+         parm_decl this test42.cpp 97:29 2147483638 - operand
          - isAutogenerated: 1
           pointer_type 2147483637 - decl type
            record_type 3 - nested type
@@ -1791,7 +1791,7 @@ function_decl __comp_ctor  test42.cpp 15:8 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  statement_list 2147483646 - code
-function_decl func7 test42.cpp 100:10 2147483647
+function_decl func7 test42.cpp 102:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -1814,42 +1814,42 @@ function_decl func7 test42.cpp 100:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 101:5 2147483646 - function result
+ result_decl test42.cpp 103:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 100:29 2147483646 - argument
+ parm_decl this test42.cpp 102:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 100:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 102:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- bind_expr test42.cpp 103:23 2147483646 - code
-  var_decl val1 test42.cpp 102:15 2147483645 - operand
+ bind_expr test42.cpp 105:23 2147483646 - code
+  var_decl val1 test42.cpp 104:15 2147483645 - operand
   - isUsed: 1
    integer_cst 576 2147483644 - decl size
    record_type 2147483644 - var type
     type_decl Data1 test42.cpp 15:8 2147483643 - type name
     - isAutogenerated: 1
   statement_list 2147483645 - operand
-   decl_expr test42.cpp 102:15 2147483644 - statement
-    var_decl val1 test42.cpp 102:15 2147483643 - operand
+   decl_expr test42.cpp 104:15 2147483644 - statement
+    var_decl val1 test42.cpp 104:15 2147483643 - operand
     - isUsed: 1
      integer_cst 576 15 - decl size 2
      record_type 15 - var type 2
       type_decl Data1 test42.cpp 15:8 14 - type name
       - isAutogenerated: 1
-   cleanup_point_expr test42.cpp 102:15 2147483644 - statement
-    expr_stmt test42.cpp 102:15 2147483643 - operand
-     call_expr test42.cpp 102:15 2147483642 - expresssion
+   cleanup_point_expr test42.cpp 104:15 2147483644 - statement
+    expr_stmt test42.cpp 104:15 2147483643 - operand
+     call_expr test42.cpp 104:15 2147483642 - expresssion
       addr_expr 2147483641 - function
        function_decl __comp_ctor  test42.cpp 15:8 20 - operand
        - isAutogenerated: 1
@@ -1884,20 +1884,20 @@ function_decl func7 test42.cpp 100:10 2147483647
          integer_cst 64 18 - parm size
         statement_list 19 - code
       addr_expr 2147483641 - arg
-       var_decl val1 test42.cpp 102:15 2147483640 - operand
+       var_decl val1 test42.cpp 104:15 2147483640 - operand
        - isUsed: 1
         integer_cst 576 15 - decl size 2
         record_type 15 - var type 2
          type_decl Data1 test42.cpp 15:8 14 - type name
          - isAutogenerated: 1
-   cleanup_stmt test42.cpp 102:15 2147483644 - statement
+   cleanup_stmt test42.cpp 104:15 2147483644 - statement
     statement_list 2147483643 - body
-     cleanup_point_expr test42.cpp 103:23 2147483642 - statement
-      expr_stmt test42.cpp 103:23 2147483641 - operand
+     cleanup_point_expr test42.cpp 105:23 2147483642 - statement
+      expr_stmt test42.cpp 105:23 2147483641 - operand
        convert_expr 2147483640 - expresssion
         modify_expr 2147483639 - operand
-         component_ref test42.cpp 103:14 2147483638 - operand
-          var_decl val1 test42.cpp 102:15 2147483637 - object
+         component_ref test42.cpp 105:14 2147483638 - operand
+          var_decl val1 test42.cpp 104:15 2147483637 - object
           - isUsed: 1
            integer_cst 576 15 - decl size 2
            record_type 15 - var type 2
@@ -1945,26 +1945,26 @@ function_decl func7 test42.cpp 100:10 2147483647
           - isAutogenerated: 1
         integer_cst 64 18 - parm size
      addr_expr 2147483642 - arg
-      var_decl val1 test42.cpp 102:15 2147483641 - operand
+      var_decl val1 test42.cpp 104:15 2147483641 - operand
       - isUsed: 1
        integer_cst 576 15 - decl size 2
        record_type 15 - var type 2
         type_decl Data1 test42.cpp 15:8 14 - type name
         - isAutogenerated: 1
-    var_decl val1 test42.cpp 102:15 2147483643 - decl
+    var_decl val1 test42.cpp 104:15 2147483643 - decl
     - isUsed: 1
      integer_cst 576 15 - decl size 2
      record_type 15 - var type 2
       type_decl Data1 test42.cpp 15:8 14 - type name
       - isAutogenerated: 1
   block 2147483645 - operand
-   var_decl val1 test42.cpp 102:15 2147483644 - block vars
+   var_decl val1 test42.cpp 104:15 2147483644 - block vars
    - isUsed: 1
     integer_cst 576 15 - decl size 2
     record_type 15 - var type 2
      type_decl Data1 test42.cpp 15:8 14 - type name
      - isAutogenerated: 1
-function_decl func8 test42.cpp 106:10 2147483647
+function_decl func8 test42.cpp 108:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -1987,12 +1987,12 @@ function_decl func8 test42.cpp 106:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 107:5 2147483646 - function result
+ result_decl test42.cpp 109:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 106:29 2147483646 - argument
+ parm_decl this test42.cpp 108:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2000,20 +2000,20 @@ function_decl func8 test42.cpp 106:10 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 106:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 108:23 2147483646 - argument
   reference_type 2147483645 - decl type
    record_type 2147483644 - nested type
     type_decl Data1 test42.cpp 15:8 2147483643 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 108:23 2147483646 - code
-  expr_stmt test42.cpp 108:23 2147483645 - operand
+ cleanup_point_expr test42.cpp 110:23 2147483646 - code
+  expr_stmt test42.cpp 110:23 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 108:14 2147483642 - operand
+     component_ref test42.cpp 110:14 2147483642 - operand
       indirect_ref 2147483641 - object
        - isUsed: 1
-       parm_decl ptr1 test42.cpp 106:23 2147483640 - ref
+       parm_decl ptr1 test42.cpp 108:23 2147483640 - ref
         reference_type 2147483639 - decl type
          record_type 2147483638 - nested type
           type_decl Data1 test42.cpp 15:8 2147483637 - type name
@@ -2031,7 +2031,7 @@ function_decl func8 test42.cpp 106:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 200 2147483642 - operand
-function_decl func9 test42.cpp 111:10 2147483647
+function_decl func9 test42.cpp 113:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2054,26 +2054,26 @@ function_decl func9 test42.cpp 111:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 112:5 2147483646 - function result
+ result_decl test42.cpp 114:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 111:29 2147483646 - argument
+ parm_decl this test42.cpp 113:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 111:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 113:23 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- bind_expr test42.cpp 114:24 2147483646 - code
-  var_decl val1 test42.cpp 113:16 2147483645 - operand
+ bind_expr test42.cpp 116:24 2147483646 - code
+  var_decl val1 test42.cpp 115:16 2147483645 - operand
   - isUsed: 1
    integer_cst 64 2147483644 - decl size
    pointer_type 2147483644 - var type
@@ -2081,21 +2081,21 @@ function_decl func9 test42.cpp 111:10 2147483647
      type_decl Data1 test42.cpp 15:8 2 - type name
      - isAutogenerated: 1
   statement_list 2147483645 - operand
-   decl_expr test42.cpp 113:16 2147483644 - statement
-    var_decl val1 test42.cpp 113:16 2147483643 - operand
+   decl_expr test42.cpp 115:16 2147483644 - statement
+    var_decl val1 test42.cpp 115:16 2147483643 - operand
     - isUsed: 1
      integer_cst 64 15 - decl size 2
      pointer_type 15 - var type 2
       record_type 3 - nested type
        type_decl Data1 test42.cpp 15:8 2 - type name
        - isAutogenerated: 1
-   cleanup_point_expr test42.cpp 114:24 2147483644 - statement
-    expr_stmt test42.cpp 114:24 2147483643 - operand
+   cleanup_point_expr test42.cpp 116:24 2147483644 - statement
+    expr_stmt test42.cpp 116:24 2147483643 - operand
      convert_expr 2147483642 - expresssion
       modify_expr 2147483641 - operand
-       component_ref test42.cpp 114:15 2147483640 - operand
+       component_ref test42.cpp 116:15 2147483640 - operand
         indirect_ref 2147483639 - object
-         var_decl val1 test42.cpp 113:16 2147483638 - ref
+         var_decl val1 test42.cpp 115:16 2147483638 - ref
          - isUsed: 1
           integer_cst 64 15 - decl size 2
           pointer_type 15 - var type 2
@@ -2115,14 +2115,14 @@ function_decl func9 test42.cpp 111:10 2147483647
           integer_cst 2147483647 4 - max value
        integer_cst 300 2147483640 - operand
   block 2147483645 - operand
-   var_decl val1 test42.cpp 113:16 2147483644 - block vars
+   var_decl val1 test42.cpp 115:16 2147483644 - block vars
    - isUsed: 1
     integer_cst 64 15 - decl size 2
     pointer_type 15 - var type 2
      record_type 3 - nested type
       type_decl Data1 test42.cpp 15:8 2 - type name
       - isAutogenerated: 1
-function_decl func10 test42.cpp 117:10 2147483647
+function_decl func10 test42.cpp 119:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2145,12 +2145,12 @@ function_decl func10 test42.cpp 117:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 118:5 2147483646 - function result
+ result_decl test42.cpp 120:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 117:30 2147483646 - argument
+ parm_decl this test42.cpp 119:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2158,18 +2158,18 @@ function_decl func10 test42.cpp 117:10 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 117:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 119:24 2147483646 - argument
   reference_type 2147483645 - decl type
    record_type 2147483644 - nested type
     type_decl Data1 test42.cpp 15:8 2147483643 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- if_stmt test42.cpp 119:9 2147483646 - code
-  eq_expr test42.cpp 119:22 2147483645 - condition
-   component_ref test42.cpp 119:18 2147483644 - operand
+ if_stmt test42.cpp 121:9 2147483646 - code
+  eq_expr test42.cpp 121:22 2147483645 - condition
+   component_ref test42.cpp 121:18 2147483644 - operand
     indirect_ref 2147483643 - object
      - isUsed: 1
-     parm_decl ptr1 test42.cpp 117:24 2147483642 - ref
+     parm_decl ptr1 test42.cpp 119:24 2147483642 - ref
       reference_type 2147483641 - decl type
        record_type 2147483640 - nested type
         type_decl Data1 test42.cpp 15:8 2147483639 - type name
@@ -2187,8 +2187,8 @@ function_decl func10 test42.cpp 117:10 2147483647
       integer_cst -2147483648 4 - min value
       integer_cst 2147483647 4 - max value
    integer_cst 100 2147483644 - operand
-  cleanup_point_expr test42.cpp 120:20 2147483645 - then
-   expr_stmt test42.cpp 120:20 2147483644 - operand
+  cleanup_point_expr test42.cpp 122:20 2147483645 - then
+   expr_stmt test42.cpp 122:20 2147483644 - operand
     convert_expr 2147483643 - expresssion
      modify_expr 2147483642 - operand
       var_decl k test42.cpp 47:5 2147483641 - operand
@@ -2203,7 +2203,7 @@ function_decl func10 test42.cpp 117:10 2147483647
         integer_cst -2147483648 2147483639 - min value
         integer_cst 2147483647 2147483639 - max value
       integer_cst 100 2147483641 - operand
-function_decl func11 test42.cpp 123:10 2147483647
+function_decl func11 test42.cpp 125:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2226,12 +2226,12 @@ function_decl func11 test42.cpp 123:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 124:5 2147483646 - function result
+ result_decl test42.cpp 126:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 123:30 2147483646 - argument
+ parm_decl this test42.cpp 125:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2239,18 +2239,18 @@ function_decl func11 test42.cpp 123:10 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 123:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 125:24 2147483646 - argument
   reference_type 2147483645 - decl type
    record_type 2147483644 - nested type
     type_decl Data2 test42.cpp 4:8 2147483643 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- if_stmt test42.cpp 125:9 2147483646 - code
-  eq_expr test42.cpp 125:22 2147483645 - condition
-   component_ref test42.cpp 125:18 2147483644 - operand
+ if_stmt test42.cpp 127:9 2147483646 - code
+  eq_expr test42.cpp 127:22 2147483645 - condition
+   component_ref test42.cpp 127:18 2147483644 - operand
     indirect_ref 2147483643 - object
      - isUsed: 1
-     parm_decl ptr1 test42.cpp 123:24 2147483642 - ref
+     parm_decl ptr1 test42.cpp 125:24 2147483642 - ref
       reference_type 2147483641 - decl type
        record_type 2147483640 - nested type
         type_decl Data2 test42.cpp 4:8 2147483639 - type name
@@ -2268,8 +2268,8 @@ function_decl func11 test42.cpp 123:10 2147483647
       integer_cst -2147483648 4 - min value
       integer_cst 2147483647 4 - max value
    integer_cst 100 2147483644 - operand
-  cleanup_point_expr test42.cpp 126:20 2147483645 - then
-   expr_stmt test42.cpp 126:20 2147483644 - operand
+  cleanup_point_expr test42.cpp 128:20 2147483645 - then
+   expr_stmt test42.cpp 128:20 2147483644 - operand
     convert_expr 2147483643 - expresssion
      modify_expr 2147483642 - operand
       var_decl k test42.cpp 47:5 2147483641 - operand
@@ -2284,7 +2284,7 @@ function_decl func11 test42.cpp 123:10 2147483647
         integer_cst -2147483648 2147483639 - min value
         integer_cst 2147483647 2147483639 - max value
       integer_cst 100 2147483641 - operand
-function_decl func12 test42.cpp 129:9 2147483647
+function_decl func12 test42.cpp 131:9 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   integer_type 2147483645 - method return type
@@ -2312,7 +2312,7 @@ function_decl func12 test42.cpp 129:9 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 130:5 2147483646 - function result
+ result_decl test42.cpp 132:5 2147483646 - function result
  - isAutogenerated: 1
   integer_type 2147483645 - result type
   - precisionBits: 32
@@ -2323,7 +2323,7 @@ function_decl func12 test42.cpp 129:9 2147483647
    integer_cst -2147483648 2147483644 - min value
    integer_cst 2147483647 2147483644 - max value
   integer_cst 32 2147483645 - decl size
- parm_decl this test42.cpp 129:29 2147483646 - argument
+ parm_decl this test42.cpp 131:29 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2331,23 +2331,23 @@ function_decl func12 test42.cpp 129:9 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 129:23 2147483646 - argument
+ parm_decl ptr1 test42.cpp 131:23 2147483646 - argument
   reference_type 2147483645 - decl type
    record_type 2147483644 - nested type
     type_decl Data2 test42.cpp 4:8 2147483643 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- bind_expr test42.cpp 132:20 2147483646 - code
-  var_decl ref1 test42.cpp 131:20 2147483645 - operand
+ bind_expr test42.cpp 134:20 2147483646 - code
+  var_decl ref1 test42.cpp 133:20 2147483645 - operand
   - isUsed: 1
    integer_cst 64 2147483644 - decl size
    nop_expr 20 - initial
     nop_expr 19 - operand
      addr_expr 18 - operand
-      component_ref test42.cpp 131:32 17 - operand
+      component_ref test42.cpp 133:32 17 - operand
        indirect_ref 16 - object
         - isUsed: 1
-        parm_decl ptr1 test42.cpp 129:23 15 - ref
+        parm_decl ptr1 test42.cpp 131:23 15 - ref
          reference_type 14 - decl type
           record_type 13 - nested type
            type_decl Data2 test42.cpp 4:8 12 - type name
@@ -2374,17 +2374,17 @@ function_decl func12 test42.cpp 129:9 2147483647
      integer_cst -2147483648 2147483642 - min value
      integer_cst 2147483647 2147483642 - max value
   statement_list 2147483645 - operand
-   decl_expr test42.cpp 131:32 2147483644 - statement
-    var_decl ref1 test42.cpp 131:20 2147483643 - operand
+   decl_expr test42.cpp 133:32 2147483644 - statement
+    var_decl ref1 test42.cpp 133:20 2147483643 - operand
     - isUsed: 1
      integer_cst 64 15 - decl size 2
      nop_expr 20 - initial 2
       nop_expr 19 - operand
        addr_expr 18 - operand
-        component_ref test42.cpp 131:32 17 - operand
+        component_ref test42.cpp 133:32 17 - operand
          indirect_ref 16 - object
           - isUsed: 1
-          parm_decl ptr1 test42.cpp 129:23 15 - ref
+          parm_decl ptr1 test42.cpp 131:23 15 - ref
            reference_type 14 - decl type
             record_type 13 - nested type
              type_decl Data2 test42.cpp 4:8 12 - type name
@@ -2410,9 +2410,9 @@ function_decl func12 test42.cpp 129:9 2147483647
        integer_cst 32 13 - type size
        integer_cst -2147483648 13 - min value
        integer_cst 2147483647 13 - max value
-   return_expr test42.cpp 132:16 2147483644 - statement
+   return_expr test42.cpp 134:16 2147483644 - statement
     init_expr 2147483643 - operand
-     result_decl test42.cpp 130:5 2147483642 - operand
+     result_decl test42.cpp 132:5 2147483642 - operand
      - isAutogenerated: 1
       integer_type 2147483641 - result type
       - precisionBits: 32
@@ -2425,16 +2425,16 @@ function_decl func12 test42.cpp 129:9 2147483647
       integer_cst 32 2147483641 - decl size
      nop_expr 2147483642 - operand
       indirect_ref 2147483641 - operand
-       var_decl ref1 test42.cpp 131:20 2147483640 - ref
+       var_decl ref1 test42.cpp 133:20 2147483640 - ref
        - isUsed: 1
         integer_cst 64 15 - decl size 2
         nop_expr 20 - initial 2
          nop_expr 19 - operand
           addr_expr 18 - operand
-           component_ref test42.cpp 131:32 17 - operand
+           component_ref test42.cpp 133:32 17 - operand
             indirect_ref 16 - object
              - isUsed: 1
-             parm_decl ptr1 test42.cpp 129:23 15 - ref
+             parm_decl ptr1 test42.cpp 131:23 15 - ref
               reference_type 14 - decl type
                record_type 13 - nested type
                 type_decl Data2 test42.cpp 4:8 12 - type name
@@ -2461,16 +2461,16 @@ function_decl func12 test42.cpp 129:9 2147483647
           integer_cst -2147483648 13 - min value
           integer_cst 2147483647 13 - max value
   block 2147483645 - operand
-   var_decl ref1 test42.cpp 131:20 2147483644 - block vars
+   var_decl ref1 test42.cpp 133:20 2147483644 - block vars
    - isUsed: 1
     integer_cst 64 15 - decl size 2
     nop_expr 20 - initial 2
      nop_expr 19 - operand
       addr_expr 18 - operand
-       component_ref test42.cpp 131:32 17 - operand
+       component_ref test42.cpp 133:32 17 - operand
         indirect_ref 16 - object
          - isUsed: 1
-         parm_decl ptr1 test42.cpp 129:23 15 - ref
+         parm_decl ptr1 test42.cpp 131:23 15 - ref
           reference_type 14 - decl type
            record_type 13 - nested type
             type_decl Data2 test42.cpp 4:8 12 - type name
@@ -2496,7 +2496,7 @@ function_decl func12 test42.cpp 129:9 2147483647
       integer_cst 32 13 - type size
       integer_cst -2147483648 13 - min value
       integer_cst 2147483647 13 - max value
-function_decl func13 test42.cpp 136:10 2147483647
+function_decl func13 test42.cpp 138:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2519,32 +2519,32 @@ function_decl func13 test42.cpp 136:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 137:5 2147483646 - function result
+ result_decl test42.cpp 139:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 136:30 2147483646 - argument
+ parm_decl this test42.cpp 138:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 136:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 138:24 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 138:36 2147483646 - code
-  expr_stmt test42.cpp 138:36 2147483645 - operand
+ cleanup_point_expr test42.cpp 140:36 2147483646 - code
+  expr_stmt test42.cpp 140:36 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 138:27 2147483642 - operand
+     component_ref test42.cpp 140:27 2147483642 - operand
       indirect_ref 2147483641 - object
-       call_expr test42.cpp 138:23 2147483640 - ref
+       call_expr test42.cpp 140:23 2147483640 - ref
         addr_expr 2147483639 - function
          function_decl getData2 test42.cpp 23:12 20 - operand
          - isExternal: 1
@@ -2609,11 +2609,11 @@ function_decl func13 test42.cpp 136:10 2147483647
                 type_decl Data1 test42.cpp 15:8 2 - type name
                 - isAutogenerated: 1
         nop_expr 2147483639 - arg
-         component_ref test42.cpp 138:9 2147483638 - operand
+         component_ref test42.cpp 140:9 2147483638 - operand
           indirect_ref 2147483637 - object
            nop_expr 2147483636 - ref
             - isUsed: 1
-            parm_decl this test42.cpp 136:30 2147483635 - operand
+            parm_decl this test42.cpp 138:30 2147483635 - operand
             - isAutogenerated: 1
              pointer_type 2147483634 - decl type
               record_type 3 - nested type
@@ -2641,7 +2641,7 @@ function_decl func13 test42.cpp 136:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func14 test42.cpp 142:10 2147483647
+function_decl func14 test42.cpp 144:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2664,32 +2664,32 @@ function_decl func14 test42.cpp 142:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 143:5 2147483646 - function result
+ result_decl test42.cpp 145:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test42.cpp 142:30 2147483646 - argument
+ parm_decl this test42.cpp 144:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test42.cpp 54:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test42.cpp 142:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 144:24 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- cleanup_point_expr test42.cpp 144:36 2147483646 - code
-  expr_stmt test42.cpp 144:36 2147483645 - operand
+ cleanup_point_expr test42.cpp 146:36 2147483646 - code
+  expr_stmt test42.cpp 146:36 2147483645 - operand
    convert_expr 2147483644 - expresssion
     modify_expr 2147483643 - operand
-     component_ref test42.cpp 144:27 2147483642 - operand
+     component_ref test42.cpp 146:27 2147483642 - operand
       indirect_ref 2147483641 - object
-       call_expr test42.cpp 144:23 2147483640 - ref
+       call_expr test42.cpp 146:23 2147483640 - ref
         addr_expr 2147483639 - function
          function_decl getData2 test42.cpp 23:12 20 - operand
          - isExternal: 1
@@ -2754,11 +2754,11 @@ function_decl func14 test42.cpp 142:10 2147483647
                 type_decl Data1 test42.cpp 15:8 2 - type name
                 - isAutogenerated: 1
         nop_expr 2147483639 - arg
-         component_ref test42.cpp 144:9 2147483638 - operand
+         component_ref test42.cpp 146:9 2147483638 - operand
           indirect_ref 2147483637 - object
            nop_expr 2147483636 - ref
             - isUsed: 1
-            parm_decl this test42.cpp 142:30 2147483635 - operand
+            parm_decl this test42.cpp 144:30 2147483635 - operand
             - isAutogenerated: 1
              pointer_type 2147483634 - decl type
               record_type 3 - nested type
@@ -2784,7 +2784,7 @@ function_decl func14 test42.cpp 142:10 2147483647
         integer_cst -2147483648 4 - min value
         integer_cst 2147483647 4 - max value
      integer_cst 100 2147483642 - operand
-function_decl func15 test42.cpp 147:10 2147483647
+function_decl func15 test42.cpp 149:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2807,12 +2807,12 @@ function_decl func15 test42.cpp 147:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 148:5 2147483646 - function result
+ result_decl test42.cpp 150:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 147:30 2147483646 - argument
+ parm_decl this test42.cpp 149:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2820,19 +2820,19 @@ function_decl func15 test42.cpp 147:10 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 147:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 149:24 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test42.cpp 15:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- if_stmt test42.cpp 149:9 2147483646 - code
+ if_stmt test42.cpp 151:9 2147483646 - code
   cleanup_point_expr 2147483645 - condition
-   truth_andif_expr test42.cpp 149:38 2147483644 - operand
-    truth_andif_expr test42.cpp 149:18 2147483643 - operand
+   truth_andif_expr test42.cpp 151:38 2147483644 - operand
+    truth_andif_expr test42.cpp 151:18 2147483643 - operand
      ne_expr 2147483642 - operand
       - isUsed: 1
-      parm_decl ptr1 test42.cpp 147:24 2147483641 - operand
+      parm_decl ptr1 test42.cpp 149:24 2147483641 - operand
        pointer_type 2147483640 - decl type
         record_type 3 - nested type
          type_decl Data1 test42.cpp 15:8 2 - type name
@@ -2840,15 +2840,15 @@ function_decl func15 test42.cpp 147:10 2147483647
        integer_cst 64 2147483640 - parm size
       integer_cst 0 2147483641 - operand
      ne_expr 2147483642 - operand
-      call_expr test42.cpp 149:35 2147483641 - operand
+      call_expr test42.cpp 151:35 2147483641 - operand
        obj_type_ref 2147483640 - function
-        indirect_ref test42.cpp 149:36 2147483639 - operand
-         pointer_plus_expr test42.cpp 149:36 2147483638 - ref
+        indirect_ref test42.cpp 151:36 2147483639 - operand
+         pointer_plus_expr test42.cpp 151:36 2147483638 - ref
           component_ref 2147483637 - operand
            indirect_ref 2147483636 - object
             non_lvalue_expr 2147483635 - ref
              - isUsed: 1
-             parm_decl ptr1 test42.cpp 147:24 2147483634 - operand
+             parm_decl ptr1 test42.cpp 149:24 2147483634 - operand
               pointer_type 2147483633 - decl type
                record_type 3 - nested type
                 type_decl Data1 test42.cpp 15:8 2 - type name
@@ -2875,7 +2875,7 @@ function_decl func15 test42.cpp 147:10 2147483647
           integer_cst 24 2147483637 - operand
         non_lvalue_expr 2147483639 - operand
          - isUsed: 1
-         parm_decl ptr1 test42.cpp 147:24 2147483638 - operand
+         parm_decl ptr1 test42.cpp 149:24 2147483638 - operand
           pointer_type 2147483637 - decl type
            record_type 3 - nested type
             type_decl Data1 test42.cpp 15:8 2 - type name
@@ -2884,14 +2884,14 @@ function_decl func15 test42.cpp 147:10 2147483647
         integer_cst 3 2147483639 - operand
        non_lvalue_expr 2147483640 - arg
         - isUsed: 1
-        parm_decl ptr1 test42.cpp 147:24 2147483639 - operand
+        parm_decl ptr1 test42.cpp 149:24 2147483639 - operand
          pointer_type 2147483638 - decl type
           record_type 3 - nested type
            type_decl Data1 test42.cpp 15:8 2 - type name
            - isAutogenerated: 1
          integer_cst 64 2147483638 - parm size
       integer_cst 0 2147483641 - operand
-    eq_expr test42.cpp 149:43 2147483643 - operand
+    eq_expr test42.cpp 151:43 2147483643 - operand
      var_decl k test42.cpp 47:5 2147483642 - operand
      - isUsed: 1
       integer_cst 32 2147483641 - decl size
@@ -2904,14 +2904,14 @@ function_decl func15 test42.cpp 147:10 2147483647
        integer_cst -2147483648 2147483640 - min value
        integer_cst 2147483647 2147483640 - max value
      integer_cst 200 2147483642 - operand
-  cleanup_point_expr test42.cpp 150:28 2147483645 - then
-   expr_stmt test42.cpp 150:28 2147483644 - operand
+  cleanup_point_expr test42.cpp 152:28 2147483645 - then
+   expr_stmt test42.cpp 152:28 2147483644 - operand
     convert_expr 2147483643 - expresssion
      modify_expr 2147483642 - operand
-      component_ref test42.cpp 150:19 2147483641 - operand
+      component_ref test42.cpp 152:19 2147483641 - operand
        indirect_ref 2147483640 - object
         - isUsed: 1
-        parm_decl ptr1 test42.cpp 147:24 2147483639 - ref
+        parm_decl ptr1 test42.cpp 149:24 2147483639 - ref
          pointer_type 2147483638 - decl type
           record_type 3 - nested type
            type_decl Data1 test42.cpp 15:8 2 - type name
@@ -2929,7 +2929,7 @@ function_decl func15 test42.cpp 147:10 2147483647
          integer_cst -2147483648 4 - min value
          integer_cst 2147483647 4 - max value
       integer_cst 100 2147483641 - operand
-function_decl func16 test42.cpp 153:10 2147483647
+function_decl func16 test42.cpp 155:10 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   void_type 2147483645 - method return type
@@ -2952,12 +2952,12 @@ function_decl func16 test42.cpp 153:10 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test42.cpp 154:5 2147483646 - function result
+ result_decl test42.cpp 156:5 2147483646 - function result
  - isAutogenerated: 1
   void_type 2147483645 - result type
    type_decl void <built-in> 0:0 2147483644 - type name
    - isAutogenerated: 1
- parm_decl this test42.cpp 153:30 2147483646 - argument
+ parm_decl this test42.cpp 155:30 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
@@ -2965,18 +2965,18 @@ function_decl func16 test42.cpp 153:10 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
  - isUsed: 1
- parm_decl ptr1 test42.cpp 153:24 2147483646 - argument
+ parm_decl ptr1 test42.cpp 155:24 2147483646 - argument
   reference_type 2147483645 - decl type
    record_type 2147483644 - nested type
     type_decl Data2 test42.cpp 4:8 2147483643 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- if_stmt test42.cpp 155:9 2147483646 - code
+ if_stmt test42.cpp 157:9 2147483646 - code
   ne_expr 2147483645 - condition
-   component_ref test42.cpp 155:18 2147483644 - operand
+   component_ref test42.cpp 157:18 2147483644 - operand
     indirect_ref 2147483643 - object
      - isUsed: 1
-     parm_decl ptr1 test42.cpp 153:24 2147483642 - ref
+     parm_decl ptr1 test42.cpp 155:24 2147483642 - ref
       reference_type 2147483641 - decl type
        record_type 2147483640 - nested type
         type_decl Data2 test42.cpp 4:8 2147483639 - type name
@@ -2990,16 +2990,16 @@ function_decl func16 test42.cpp 153:10 2147483647
        type_decl Data1 test42.cpp 15:8 2 - type name
        - isAutogenerated: 1
    integer_cst 0 2147483644 - operand
-  cleanup_point_expr test42.cpp 156:35 2147483645 - then
-   expr_stmt test42.cpp 156:35 2147483644 - operand
+  cleanup_point_expr test42.cpp 158:35 2147483645 - then
+   expr_stmt test42.cpp 158:35 2147483644 - operand
     convert_expr 2147483643 - expresssion
      modify_expr 2147483642 - operand
-      component_ref test42.cpp 156:26 2147483641 - operand
+      component_ref test42.cpp 158:26 2147483641 - operand
        indirect_ref 2147483640 - object
-        component_ref test42.cpp 156:18 2147483639 - ref
+        component_ref test42.cpp 158:18 2147483639 - ref
          indirect_ref 2147483638 - object
           - isUsed: 1
-          parm_decl ptr1 test42.cpp 153:24 2147483637 - ref
+          parm_decl ptr1 test42.cpp 155:24 2147483637 - ref
            reference_type 2147483636 - decl type
             record_type 2147483635 - nested type
              type_decl Data2 test42.cpp 4:8 2147483634 - type name
@@ -3024,3 +3024,142 @@ function_decl func16 test42.cpp 153:10 2147483647
          integer_cst -2147483648 4 - min value
          integer_cst 2147483647 4 - max value
       integer_cst 100 2147483641 - operand
+function_decl func17 test42.cpp 161:10 2147483647
+- isPublic: 1
+ method_type 2147483646 - function type
+  void_type 2147483645 - method return type
+   type_decl void <built-in> 0:0 2147483644 - type name
+   - isAutogenerated: 1
+  record_type 2147483645 - method base type
+   type_decl Object1 test42.cpp 54:7 2147483644 - type name
+   - isAutogenerated: 1
+  tree_list 2147483645 - arg types
+   pointer_type 2147483644 - value
+    record_type 3 - nested type
+     type_decl Object1 test42.cpp 54:7 2 - type name
+     - isAutogenerated: 1
+   tree_list 2147483644 - chain
+    pointer_type 2147483643 - value
+     record_type 3 - nested type
+      type_decl Data1 test42.cpp 15:8 2 - type name
+      - isAutogenerated: 1
+    tree_list 2147483643 - chain
+     void_type 2147483642 - value
+      type_decl void <built-in> 0:0 2147483641 - type name
+      - isAutogenerated: 1
+ result_decl test42.cpp 162:5 2147483646 - function result
+ - isAutogenerated: 1
+  void_type 2147483645 - result type
+   type_decl void <built-in> 0:0 2147483644 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test42.cpp 161:28 2147483646 - argument
+ - isAutogenerated: 1
+  pointer_type 2147483645 - decl type
+   record_type 3 - nested type
+    type_decl Object1 test42.cpp 54:7 2 - type name
+    - isAutogenerated: 1
+  integer_cst 64 2147483645 - parm size
+ parm_decl ptr1 test42.cpp 161:24 2147483646 - argument
+  pointer_type 2147483645 - decl type
+   record_type 3 - nested type
+    type_decl Data1 test42.cpp 15:8 2 - type name
+    - isAutogenerated: 1
+  integer_cst 64 2147483645 - parm size
+ statement_list 2147483646 - code
+  cleanup_point_expr test42.cpp 163:23 2147483645 - statement
+   expr_stmt test42.cpp 163:23 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test42.cpp 163:9 2147483641 - operand
+       indirect_ref 2147483640 - object
+        nop_expr 2147483639 - ref
+         - isUsed: 1
+         parm_decl this test42.cpp 161:28 2147483638 - operand
+         - isAutogenerated: 1
+          pointer_type 2147483637 - decl type
+           record_type 3 - nested type
+            type_decl Object1 test42.cpp 54:7 2 - type name
+            - isAutogenerated: 1
+          integer_cst 64 2147483637 - parm size
+       field_decl x test42.cpp 59:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+      component_ref test42.cpp 163:20 2147483641 - operand
+       indirect_ref 2147483640 - object
+        var_decl gptr2 test42.cpp 50:8 2147483639 - ref
+        - isUsed: 1
+         tree_list 2147483638 - attribute
+          identifier_node nonnullpointer 2147483637 - purpose
+         integer_cst 64 2147483638 - decl size
+         pointer_type 2147483638 - var type
+          record_type 3 - nested type
+           type_decl Data1 test42.cpp 15:8 2 - type name
+           - isAutogenerated: 1
+       field_decl val test42.cpp 17:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+  cleanup_point_expr test42.cpp 164:23 2147483645 - statement
+   expr_stmt test42.cpp 164:23 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test42.cpp 164:9 2147483641 - operand
+       indirect_ref 2147483640 - object
+        nop_expr 2147483639 - ref
+         - isUsed: 1
+         parm_decl this test42.cpp 161:28 2147483638 - operand
+         - isAutogenerated: 1
+          pointer_type 2147483637 - decl type
+           record_type 3 - nested type
+            type_decl Object1 test42.cpp 54:7 2 - type name
+            - isAutogenerated: 1
+          integer_cst 64 2147483637 - parm size
+       field_decl y test42.cpp 60:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+      component_ref test42.cpp 164:20 2147483641 - operand
+       indirect_ref 2147483640 - object
+        var_decl gptr2 test42.cpp 50:8 2147483639 - ref
+        - isUsed: 1
+         tree_list 2147483638 - attribute
+          identifier_node nonnullpointer 2147483637 - purpose
+         integer_cst 64 15 - decl size 2
+         pointer_type 15 - var type 2
+          record_type 3 - nested type
+           type_decl Data1 test42.cpp 15:8 2 - type name
+           - isAutogenerated: 1
+       field_decl val test42.cpp 17:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
diff --git a/test/test42-02.txt b/test/test42-02.txt
index 68823f3..3e25310 100644
--- a/test/test42-02.txt
+++ b/test/test42-02.txt
@@ -26,3 +26,4 @@ func13: pointer_type ptr1,
 func14: pointer_type ptr1, 
 func15: pointer_type ptr1, 
 func16: 
+func17: pointer_type ptr1, 
diff --git a/test/test42-03.txt b/test/test42-03.txt
index 417f8c3..e85ccaf 100644
--- a/test/test42-03.txt
+++ b/test/test42-03.txt
@@ -170,7 +170,7 @@ expr_stmt : ptr1,
 convert_expr : ptr1, 
 modify_expr : ptr1, 
 test42.cpp: In member function 'void Object1::func1(Data1*) const':
-test42.cpp:72:24: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:74:24: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->val = 100;
                         ^
 component_ref : ptr1, 
@@ -230,7 +230,7 @@ expr_stmt : ptr1,
 convert_expr : ptr1, 
 modify_expr : ptr1, 
 test42.cpp: In member function 'void Object1::func3(Data1*) const':
-test42.cpp:82:25: warning: Using variable 'gptr1' without checking for null pointer
+test42.cpp:84:25: warning: Using variable 'gptr1' without checking for null pointer
          gptr1->val = 100;
                          ^
 component_ref : ptr1, 
@@ -278,7 +278,7 @@ call_expr : ptr1,
 addr_expr : ptr1, 
 function_decl getData2: ptr1, 
 test42.cpp: In member function 'void Object1::func5(Data1*) const':
-test42.cpp:92:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:94:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2();
                        ^
 component_ref : ptr1, 
@@ -551,10 +551,10 @@ expr_stmt : ptr1, val1,
 convert_expr : ptr1, val1, 
 modify_expr : ptr1, val1, 
 test42.cpp: In member function 'void Object1::func9(Data1*) const':
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
          val1->val = 300;
                         ^
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
 component_ref : ptr1, val1, 
 indirect_ref : ptr1, val1, 
 var_decl val1: ptr1, val1, 
@@ -793,7 +793,7 @@ call_expr : ptr1,
 addr_expr : ptr1, 
 function_decl getData2: ptr1, 
 test42.cpp: In member function 'void Object1::func14(Data1*) const':
-test42.cpp:144:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:146:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2()->val = 100;
                        ^
 component_ref : ptr1, 
@@ -938,3 +938,73 @@ integer_cst 32:
 integer_cst -2147483648: 
 integer_cst 2147483647: 
 integer_cst 100: 
+function_decl func17: 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl x: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr2: ptr1, 
+tree_list : ptr1, 
+identifier_node nonnullpointer: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl y: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr2: ptr1, 
+tree_list : ptr1, 
+identifier_node nonnullpointer: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
diff --git a/test/test42-04.txt b/test/test42-04.txt
index 7e856b4..ad5c020 100644
--- a/test/test42-04.txt
+++ b/test/test42-04.txt
@@ -1,21 +1,21 @@
 test42.cpp: In member function 'void Object1::func1(Data1*) const':
-test42.cpp:72:24: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:74:24: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->val = 100;
                         ^
 test42.cpp: In member function 'void Object1::func3(Data1*) const':
-test42.cpp:82:25: warning: Using variable 'gptr1' without checking for null pointer
+test42.cpp:84:25: warning: Using variable 'gptr1' without checking for null pointer
          gptr1->val = 100;
                          ^
 test42.cpp: In member function 'void Object1::func5(Data1*) const':
-test42.cpp:92:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:94:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2();
                        ^
 test42.cpp: In member function 'void Object1::func9(Data1*) const':
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
          val1->val = 300;
                         ^
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
 test42.cpp: In member function 'void Object1::func14(Data1*) const':
-test42.cpp:144:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:146:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2()->val = 100;
                        ^
diff --git a/test/test42-05.txt b/test/test42-05.txt
index 7e856b4..ad5c020 100644
--- a/test/test42-05.txt
+++ b/test/test42-05.txt
@@ -1,21 +1,21 @@
 test42.cpp: In member function 'void Object1::func1(Data1*) const':
-test42.cpp:72:24: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:74:24: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->val = 100;
                         ^
 test42.cpp: In member function 'void Object1::func3(Data1*) const':
-test42.cpp:82:25: warning: Using variable 'gptr1' without checking for null pointer
+test42.cpp:84:25: warning: Using variable 'gptr1' without checking for null pointer
          gptr1->val = 100;
                          ^
 test42.cpp: In member function 'void Object1::func5(Data1*) const':
-test42.cpp:92:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:94:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2();
                        ^
 test42.cpp: In member function 'void Object1::func9(Data1*) const':
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
          val1->val = 300;
                         ^
-test42.cpp:114:24: warning: Using variable 'val1' without checking for null pointer
+test42.cpp:116:24: warning: Using variable 'val1' without checking for null pointer
 test42.cpp: In member function 'void Object1::func14(Data1*) const':
-test42.cpp:144:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test42.cpp:146:23: warning: Using variable 'this->tmp1' without checking for null pointer
          tmp1->getData2()->val = 100;
                        ^
diff --git a/test/test42.cpp b/test/test42.cpp
index 532dee7..6501fd6 100644
--- a/test/test42.cpp
+++ b/test/test42.cpp
@@ -56,6 +56,8 @@ class Object1
     Data1 *tmp1;
     Data1 *tmp2;
     Data1 *tmp3 __attribute__((nonnullpointer));
+    int x;
+    int y;
 
     Data1 *getData1()
     {
@@ -156,4 +158,9 @@ class Object1
             ptr1.ptrval->val = 100;
     }
 
+    void func17(Data1 *ptr1)
+    {
+        x = gptr2->val;
+        y = gptr2->val;
+    }
 };
diff --git a/test/test43-01.txt b/test/test43-01.txt
index 1c952fc..485a750 100644
--- a/test/test43-01.txt
+++ b/test/test43-01.txt
@@ -568,7 +568,7 @@ function_decl getData6 test43.cpp 47:20 2147483647
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
    integer_cst 0 2147483644 - operand
-function_decl getData1 test43.cpp 66:12 2147483647
+function_decl getData1 test43.cpp 68:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -587,7 +587,7 @@ function_decl getData1 test43.cpp 66:12 2147483647
     void_type 2147483643 - value
      type_decl void <built-in> 0:0 2147483642 - type name
      - isAutogenerated: 1
- result_decl test43.cpp 67:5 2147483646 - function result
+ result_decl test43.cpp 69:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -595,27 +595,27 @@ function_decl getData1 test43.cpp 66:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test43.cpp 66:21 2147483646 - argument
+ parm_decl this test43.cpp 68:21 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test43.cpp 60:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test43.cpp 68:16 2147483646 - code
+ return_expr test43.cpp 70:16 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test43.cpp 67:5 2147483644 - operand
+   result_decl test43.cpp 69:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
       type_decl Data1 test43.cpp 21:8 2 - type name
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
-   component_ref test43.cpp 68:16 2147483644 - operand
+   component_ref test43.cpp 70:16 2147483644 - operand
     indirect_ref 2147483643 - object
      nop_expr 2147483642 - ref
       - isUsed: 1
-      parm_decl this test43.cpp 66:21 2147483641 - operand
+      parm_decl this test43.cpp 68:21 2147483641 - operand
       - isAutogenerated: 1
        pointer_type 2147483640 - decl type
         record_type 3 - nested type
@@ -629,7 +629,7 @@ function_decl getData1 test43.cpp 66:12 2147483647
       record_type 3 - nested type
        type_decl Data1 test43.cpp 21:8 2 - type name
        - isAutogenerated: 1
-function_decl getData2 test43.cpp 71:12 2147483647
+function_decl getData2 test43.cpp 73:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -648,7 +648,7 @@ function_decl getData2 test43.cpp 71:12 2147483647
     void_type 2147483643 - value
      type_decl void <built-in> 0:0 2147483642 - type name
      - isAutogenerated: 1
- result_decl test43.cpp 72:5 2147483646 - function result
+ result_decl test43.cpp 74:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -656,27 +656,27 @@ function_decl getData2 test43.cpp 71:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test43.cpp 71:21 2147483646 - argument
+ parm_decl this test43.cpp 73:21 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test43.cpp 60:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test43.cpp 73:16 2147483646 - code
+ return_expr test43.cpp 75:16 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test43.cpp 72:5 2147483644 - operand
+   result_decl test43.cpp 74:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
       type_decl Data1 test43.cpp 21:8 2 - type name
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
-   component_ref test43.cpp 73:16 2147483644 - operand
+   component_ref test43.cpp 75:16 2147483644 - operand
     indirect_ref 2147483643 - object
      nop_expr 2147483642 - ref
       - isUsed: 1
-      parm_decl this test43.cpp 71:21 2147483641 - operand
+      parm_decl this test43.cpp 73:21 2147483641 - operand
       - isAutogenerated: 1
        pointer_type 2147483640 - decl type
         record_type 3 - nested type
@@ -690,7 +690,7 @@ function_decl getData2 test43.cpp 71:12 2147483647
       record_type 3 - nested type
        type_decl Data1 test43.cpp 21:8 2 - type name
        - isAutogenerated: 1
-function_decl func1 test43.cpp 76:12 2147483647
+function_decl func1 test43.cpp 78:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -714,7 +714,7 @@ function_decl func1 test43.cpp 76:12 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test43.cpp 77:5 2147483646 - function result
+ result_decl test43.cpp 79:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -722,22 +722,22 @@ function_decl func1 test43.cpp 76:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test43.cpp 76:31 2147483646 - argument
+ parm_decl this test43.cpp 78:31 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test43.cpp 60:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test43.cpp 76:25 2147483646 - argument
+ parm_decl ptr1 test43.cpp 78:25 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test43.cpp 21:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test43.cpp 78:27 2147483646 - code
+ return_expr test43.cpp 80:27 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test43.cpp 77:5 2147483644 - operand
+   result_decl test43.cpp 79:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
@@ -759,11 +759,11 @@ function_decl func1 test43.cpp 76:12 2147483647
         integer_cst -2147483648 2147483639 - min value
         integer_cst 2147483647 2147483639 - max value
       integer_cst 0 2147483641 - operand
-     component_ref test43.cpp 78:20 2147483642 - operand
+     component_ref test43.cpp 80:20 2147483642 - operand
       indirect_ref 2147483641 - object
        nop_expr 2147483640 - ref
         - isUsed: 1
-        parm_decl this test43.cpp 76:31 2147483639 - operand
+        parm_decl this test43.cpp 78:31 2147483639 - operand
         - isAutogenerated: 1
          pointer_type 2147483638 - decl type
           record_type 3 - nested type
@@ -777,11 +777,11 @@ function_decl func1 test43.cpp 76:12 2147483647
         record_type 3 - nested type
          type_decl Data1 test43.cpp 21:8 2 - type name
          - isAutogenerated: 1
-     component_ref test43.cpp 78:27 2147483642 - operand
+     component_ref test43.cpp 80:27 2147483642 - operand
       indirect_ref 2147483641 - object
        nop_expr 2147483640 - ref
         - isUsed: 1
-        parm_decl this test43.cpp 76:31 2147483639 - operand
+        parm_decl this test43.cpp 78:31 2147483639 - operand
         - isAutogenerated: 1
          pointer_type 2147483638 - decl type
           record_type 3 - nested type
@@ -795,7 +795,7 @@ function_decl func1 test43.cpp 76:12 2147483647
         record_type 3 - nested type
          type_decl Data1 test43.cpp 21:8 2 - type name
          - isAutogenerated: 1
-function_decl func2 test43.cpp 81:12 2147483647
+function_decl func2 test43.cpp 83:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -819,7 +819,7 @@ function_decl func2 test43.cpp 81:12 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test43.cpp 82:5 2147483646 - function result
+ result_decl test43.cpp 84:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -827,22 +827,22 @@ function_decl func2 test43.cpp 81:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test43.cpp 81:31 2147483646 - argument
+ parm_decl this test43.cpp 83:31 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test43.cpp 60:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test43.cpp 81:25 2147483646 - argument
+ parm_decl ptr1 test43.cpp 83:25 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test43.cpp 21:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test43.cpp 83:16 2147483646 - code
+ return_expr test43.cpp 85:16 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test43.cpp 82:5 2147483644 - operand
+   result_decl test43.cpp 84:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
@@ -850,11 +850,11 @@ function_decl func2 test43.cpp 81:12 2147483647
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
    nop_expr 2147483644 - operand
-    component_ref test43.cpp 83:16 2147483643 - operand
+    component_ref test43.cpp 85:16 2147483643 - operand
      indirect_ref 2147483642 - object
       nop_expr 2147483641 - ref
        - isUsed: 1
-       parm_decl this test43.cpp 81:31 2147483640 - operand
+       parm_decl this test43.cpp 83:31 2147483640 - operand
        - isAutogenerated: 1
         pointer_type 2147483639 - decl type
          record_type 3 - nested type
@@ -868,7 +868,7 @@ function_decl func2 test43.cpp 81:12 2147483647
        record_type 3 - nested type
         type_decl Data1 test43.cpp 21:8 2 - type name
         - isAutogenerated: 1
-function_decl func3 test43.cpp 86:12 2147483647
+function_decl func3 test43.cpp 88:12 2147483647
 - isPublic: 1
  method_type 2147483646 - function type
   pointer_type 2147483645 - method return type
@@ -892,7 +892,7 @@ function_decl func3 test43.cpp 86:12 2147483647
      void_type 2147483642 - value
       type_decl void <built-in> 0:0 2147483641 - type name
       - isAutogenerated: 1
- result_decl test43.cpp 87:5 2147483646 - function result
+ result_decl test43.cpp 89:5 2147483646 - function result
  - isAutogenerated: 1
   pointer_type 2147483645 - result type
    record_type 3 - nested type
@@ -900,35 +900,35 @@ function_decl func3 test43.cpp 86:12 2147483647
     - isAutogenerated: 1
   integer_cst 64 2147483645 - decl size
  - isUsed: 1
- parm_decl this test43.cpp 86:31 2147483646 - argument
+ parm_decl this test43.cpp 88:31 2147483646 - argument
  - isAutogenerated: 1
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Object1 test43.cpp 60:7 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- parm_decl ptr1 test43.cpp 86:25 2147483646 - argument
+ parm_decl ptr1 test43.cpp 88:25 2147483646 - argument
   pointer_type 2147483645 - decl type
    record_type 3 - nested type
     type_decl Data1 test43.cpp 21:8 2 - type name
     - isAutogenerated: 1
   integer_cst 64 2147483645 - parm size
- return_expr test43.cpp 88:23 2147483646 - code
+ return_expr test43.cpp 90:23 2147483646 - code
   init_expr 2147483645 - operand
-   result_decl test43.cpp 87:5 2147483644 - operand
+   result_decl test43.cpp 89:5 2147483644 - operand
    - isAutogenerated: 1
     pointer_type 2147483643 - result type
      record_type 3 - nested type
       type_decl Data1 test43.cpp 21:8 2 - type name
       - isAutogenerated: 1
     integer_cst 64 2147483643 - decl size
-   pointer_plus_expr test43.cpp 88:23 2147483644 - operand
+   pointer_plus_expr test43.cpp 90:23 2147483644 - operand
     nop_expr 2147483643 - operand
-     component_ref test43.cpp 88:17 2147483642 - operand
+     component_ref test43.cpp 90:17 2147483642 - operand
       indirect_ref 2147483641 - object
        nop_expr 2147483640 - ref
         - isUsed: 1
-        parm_decl this test43.cpp 86:31 2147483639 - operand
+        parm_decl this test43.cpp 88:31 2147483639 - operand
         - isAutogenerated: 1
          pointer_type 2147483638 - decl type
           record_type 3 - nested type
@@ -943,3 +943,175 @@ function_decl func3 test43.cpp 86:12 2147483647
          type_decl Data1 test43.cpp 21:8 2 - type name
          - isAutogenerated: 1
     integer_cst 72 2147483643 - operand
+function_decl func4 test43.cpp 93:10 2147483647
+- isPublic: 1
+ method_type 2147483646 - function type
+  void_type 2147483645 - method return type
+   type_decl void <built-in> 0:0 2147483644 - type name
+   - isAutogenerated: 1
+  record_type 2147483645 - method base type
+   type_decl Object1 test43.cpp 60:7 2147483644 - type name
+   - isAutogenerated: 1
+  tree_list 2147483645 - arg types
+   pointer_type 2147483644 - value
+    record_type 3 - nested type
+     type_decl Object1 test43.cpp 60:7 2 - type name
+     - isAutogenerated: 1
+   tree_list 2147483644 - chain
+    pointer_type 2147483643 - value
+     record_type 3 - nested type
+      type_decl Data1 test43.cpp 21:8 2 - type name
+      - isAutogenerated: 1
+    tree_list 2147483643 - chain
+     void_type 2147483642 - value
+      type_decl void <built-in> 0:0 2147483641 - type name
+      - isAutogenerated: 1
+ result_decl test43.cpp 94:5 2147483646 - function result
+ - isAutogenerated: 1
+  void_type 2147483645 - result type
+   type_decl void <built-in> 0:0 2147483644 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test43.cpp 93:27 2147483646 - argument
+ - isAutogenerated: 1
+  pointer_type 2147483645 - decl type
+   record_type 3 - nested type
+    type_decl Object1 test43.cpp 60:7 2 - type name
+    - isAutogenerated: 1
+  integer_cst 64 2147483645 - parm size
+ parm_decl ptr1 test43.cpp 93:23 2147483646 - argument
+  pointer_type 2147483645 - decl type
+   record_type 3 - nested type
+    type_decl Data1 test43.cpp 21:8 2 - type name
+    - isAutogenerated: 1
+  integer_cst 64 2147483645 - parm size
+ statement_list 2147483646 - code
+  cleanup_point_expr test43.cpp 95:22 2147483645 - statement
+   expr_stmt test43.cpp 95:22 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test43.cpp 95:9 2147483641 - operand
+       indirect_ref 2147483640 - object
+        nop_expr 2147483639 - ref
+         - isUsed: 1
+         parm_decl this test43.cpp 93:27 2147483638 - operand
+         - isAutogenerated: 1
+          pointer_type 2147483637 - decl type
+           record_type 3 - nested type
+            type_decl Object1 test43.cpp 60:7 2 - type name
+            - isAutogenerated: 1
+          integer_cst 64 2147483637 - parm size
+       field_decl x test43.cpp 65:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+      component_ref test43.cpp 95:19 2147483641 - operand
+       indirect_ref 2147483640 - object
+        component_ref test43.cpp 95:13 2147483639 - ref
+         indirect_ref 2147483638 - object
+          nop_expr 2147483637 - ref
+           - isUsed: 1
+           parm_decl this test43.cpp 93:27 2147483636 - operand
+           - isAutogenerated: 1
+            pointer_type 2147483635 - decl type
+             record_type 3 - nested type
+              type_decl Object1 test43.cpp 60:7 2 - type name
+              - isAutogenerated: 1
+            integer_cst 64 2147483635 - parm size
+         field_decl tmp3 test43.cpp 64:47 2147483638 - field
+         - unsigned
+          tree_list 2147483637 - attribute
+           identifier_node nonnullpointer 2147483636 - purpose
+          integer_cst 64 2147483637 - decl size
+          pointer_type 5 - field type
+           record_type 3 - nested type
+            type_decl Data1 test43.cpp 21:8 2 - type name
+            - isAutogenerated: 1
+       field_decl val test43.cpp 23:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+  cleanup_point_expr test43.cpp 96:25 2147483645 - statement
+   expr_stmt test43.cpp 96:25 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test43.cpp 96:9 2147483641 - operand
+       indirect_ref 2147483640 - object
+        nop_expr 2147483639 - ref
+         - isUsed: 1
+         parm_decl this test43.cpp 93:27 2147483638 - operand
+         - isAutogenerated: 1
+          pointer_type 2147483637 - decl type
+           record_type 3 - nested type
+            type_decl Object1 test43.cpp 60:7 2 - type name
+            - isAutogenerated: 1
+          integer_cst 64 2147483637 - parm size
+       field_decl y test43.cpp 66:9 2147483640 - field
+       - signed
+        integer_cst 32 2147483639 - decl size
+        integer_type 5 - field type
+        - precisionBits: 32
+        - signed
+         type_decl int <built-in> 0:0 4 - type name
+         - isAutogenerated: 1
+         integer_cst 32 4 - type size
+         integer_cst -2147483648 4 - min value
+         integer_cst 2147483647 4 - max value
+      array_ref test43.cpp 96:24 2147483641 - operand
+       integer_cst 0 2147483640 - low bound
+       integer_cst 4 2147483640 - element size
+       component_ref test43.cpp 96:19 2147483640 - operand
+        indirect_ref 2147483639 - object
+         component_ref test43.cpp 96:13 2147483638 - ref
+          indirect_ref 2147483637 - object
+           nop_expr 2147483636 - ref
+            - isUsed: 1
+            parm_decl this test43.cpp 93:27 2147483635 - operand
+            - isAutogenerated: 1
+             pointer_type 2147483634 - decl type
+              record_type 3 - nested type
+               type_decl Object1 test43.cpp 60:7 2 - type name
+               - isAutogenerated: 1
+             integer_cst 64 2147483634 - parm size
+          field_decl tmp3 test43.cpp 64:47 2147483637 - field
+          - unsigned
+           tree_list 2147483636 - attribute
+            identifier_node nonnullpointer 2147483635 - purpose
+           integer_cst 64 2147483636 - decl size
+           pointer_type 5 - field type
+            record_type 3 - nested type
+             type_decl Data1 test43.cpp 21:8 2 - type name
+             - isAutogenerated: 1
+        field_decl arr test43.cpp 26:14 2147483639 - field
+        - signed
+         integer_cst 96 2147483638 - decl size
+         array_type 5 - field type
+          integer_type 4 - element type
+          - precisionBits: 32
+          - signed
+           type_decl int <built-in> 0:0 3 - type name
+           - isAutogenerated: 1
+           integer_cst 32 3 - type size
+           integer_cst -2147483648 3 - min value
+           integer_cst 2147483647 3 - max value
+          integer_type 4 - domain
+          - precisionBits: 64
+          - signed
+           integer_cst 64 3 - type size
+           integer_cst 0 3 - min value
+           integer_cst 2 3 - max value
+       integer_cst 0 2147483640 - operand
diff --git a/test/test43-02.txt b/test/test43-02.txt
index 59f03ed..03454b6 100644
--- a/test/test43-02.txt
+++ b/test/test43-02.txt
@@ -12,3 +12,4 @@ getData2:
 func1: pointer_type ptr1, 
 func2: pointer_type ptr1, 
 func3: pointer_type ptr1, 
+func4: pointer_type ptr1, 
diff --git a/test/test43-03.txt b/test/test43-03.txt
index 1e5d805..e226e47 100644
--- a/test/test43-03.txt
+++ b/test/test43-03.txt
@@ -313,7 +313,7 @@ type_decl Data1: ptr1,
 integer_cst 64: ptr1, 
 pointer_plus_expr : ptr1, 
 test43.cpp: In member function 'Data1* Object1::func3(Data1*) const':
-test43.cpp:88:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test43.cpp:90:23: warning: Using variable 'this->tmp1' without checking for null pointer
          return &tmp1[1];
                        ^
 component_ref : ptr1, 
@@ -329,3 +329,96 @@ pointer_type : ptr1,
 record_type : ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 72: ptr1, 
+function_decl func4: 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl x: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl tmp3: ptr1, 
+tree_list : ptr1, 
+identifier_node nonnullpointer: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl y: ptr1, 
+integer_cst 32: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+array_ref : ptr1, 
+integer_cst 0: ptr1, 
+integer_cst 4: ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+parm_decl this: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Object1: ptr1, 
+integer_cst 64: ptr1, 
+field_decl tmp3: ptr1, 
+tree_list : ptr1, 
+identifier_node nonnullpointer: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+array_type : ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_type : ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+integer_cst 2: ptr1, 
+integer_cst 0: ptr1, 
diff --git a/test/test43-04.txt b/test/test43-04.txt
index e1eb5fe..343c33d 100644
--- a/test/test43-04.txt
+++ b/test/test43-04.txt
@@ -1,4 +1,4 @@
 test43.cpp: In member function 'Data1* Object1::func3(Data1*) const':
-test43.cpp:88:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test43.cpp:90:23: warning: Using variable 'this->tmp1' without checking for null pointer
          return &tmp1[1];
                        ^
diff --git a/test/test43-05.txt b/test/test43-05.txt
index e1eb5fe..343c33d 100644
--- a/test/test43-05.txt
+++ b/test/test43-05.txt
@@ -1,4 +1,4 @@
 test43.cpp: In member function 'Data1* Object1::func3(Data1*) const':
-test43.cpp:88:23: warning: Using variable 'this->tmp1' without checking for null pointer
+test43.cpp:90:23: warning: Using variable 'this->tmp1' without checking for null pointer
          return &tmp1[1];
                        ^
diff --git a/test/test43.cpp b/test/test43.cpp
index 103de1c..91152f9 100644
--- a/test/test43.cpp
+++ b/test/test43.cpp
@@ -62,6 +62,8 @@ class Object1
     Data1 *tmp1;
     Data1 *tmp2;
     Data1 *tmp3 __attribute__((nonnullpointer));
+    int x;
+    int y;
 
     Data1 *getData1()
     {
@@ -87,4 +89,10 @@ class Object1
     {
         return &tmp1[1];
     }
+
+    void func4(Data1 *ptr1)
+    {
+        x = tmp3->val;
+        y = tmp3->arr[0];
+    }
 };