Update test 42.

4 files changed, 412 insertions, 0 deletions

diff --git a/test/test42-01.txt b/test/test42-01.txt
index 6b6a511..4d2690d 100644
--- a/test/test42-01.txt
+++ b/test/test42-01.txt
@@ -3163,3 +3163,263 @@ function_decl func17 test42.cpp 161:10 2147483647
          integer_cst 32 4 - type size
          integer_cst -2147483648 4 - min value
          integer_cst 2147483647 4 - max value
+function_decl func18 test42.cpp 167: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 168: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 167: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 167: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 169:9 2147483646 - code
+  cleanup_point_expr 2147483645 - condition
+   truth_andif_expr test42.cpp 169:19 2147483644 - operand
+    ne_expr 2147483643 - operand
+     var_decl gptr1 test42.cpp 49:8 2147483642 - operand
+     - isUsed: 1
+      integer_cst 64 2147483641 - decl size
+      pointer_type 2147483641 - var type
+       record_type 3 - nested type
+        type_decl Data1 test42.cpp 15:8 2 - type name
+        - isAutogenerated: 1
+     integer_cst 0 2147483642 - operand
+    ne_expr 2147483643 - operand
+     call_expr test42.cpp 169:37 2147483642 - operand
+      obj_type_ref 2147483641 - function
+       indirect_ref test42.cpp 169:38 2147483640 - operand
+        pointer_plus_expr test42.cpp 169:38 2147483639 - ref
+         component_ref 2147483638 - operand
+          indirect_ref 2147483637 - object
+           non_lvalue_expr 2147483636 - ref
+            var_decl gptr1 test42.cpp 49:8 2147483635 - 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
+          field_decl _vptr.Data1 test42.cpp 15:8 2147483637 - field
+          - unsigned
+          - isVirtual: 1
+          - isAutogenerated: 1
+           integer_cst 64 2147483636 - decl size
+           pointer_type 5 - field type
+            pointer_type 3 - nested type
+             type_decl __vtbl_ptr_type <built-in> 0:0 2 - type name
+             - isAutogenerated: 1
+             function_type 2 - nested type
+              integer_type 1 - function return type
+              - precisionBits: 32
+              - signed
+               type_decl int <built-in> 0:0 0 - type name
+               - isAutogenerated: 1
+               integer_cst 32 0 - type size
+               integer_cst -2147483648 0 - min value
+               integer_cst 2147483647 0 - max value
+         integer_cst 24 2147483638 - operand
+       non_lvalue_expr 2147483640 - operand
+        var_decl gptr1 test42.cpp 49:8 2147483639 - 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
+       integer_cst 3 2147483640 - operand
+      non_lvalue_expr 2147483641 - arg
+       var_decl gptr1 test42.cpp 49:8 2147483640 - 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
+     integer_cst 0 2147483642 - operand
+  cleanup_point_expr test42.cpp 170:29 2147483645 - then
+   expr_stmt test42.cpp 170:29 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test42.cpp 170:20 2147483641 - operand
+       indirect_ref 2147483640 - object
+        var_decl gptr1 test42.cpp 49:8 2147483639 - ref
+        - 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
+       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
+      integer_cst 100 2147483641 - operand
+function_decl func19 test42.cpp 173: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 174: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 173: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 173: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 176:9 2147483646 - code
+  cleanup_point_expr 2147483645 - condition
+   truth_andif_expr test42.cpp 176:19 2147483644 - operand
+    ne_expr 2147483643 - operand
+     var_decl gptr1 test42.cpp 49:8 2147483642 - operand
+     - isUsed: 1
+      integer_cst 64 2147483641 - decl size
+      pointer_type 2147483641 - var type
+       record_type 3 - nested type
+        type_decl Data1 test42.cpp 15:8 2 - type name
+        - isAutogenerated: 1
+     integer_cst 0 2147483642 - operand
+    ne_expr 2147483643 - operand
+     call_expr test42.cpp 176:37 2147483642 - operand
+      obj_type_ref 2147483641 - function
+       indirect_ref test42.cpp 176:38 2147483640 - operand
+        pointer_plus_expr test42.cpp 176:38 2147483639 - ref
+         component_ref 2147483638 - operand
+          indirect_ref 2147483637 - object
+           non_lvalue_expr 2147483636 - ref
+            var_decl gptr1 test42.cpp 49:8 2147483635 - 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
+          field_decl _vptr.Data1 test42.cpp 15:8 2147483637 - field
+          - unsigned
+          - isVirtual: 1
+          - isAutogenerated: 1
+           integer_cst 64 2147483636 - decl size
+           pointer_type 5 - field type
+            pointer_type 3 - nested type
+             type_decl __vtbl_ptr_type <built-in> 0:0 2 - type name
+             - isAutogenerated: 1
+             function_type 2 - nested type
+              integer_type 1 - function return type
+              - precisionBits: 32
+              - signed
+               type_decl int <built-in> 0:0 0 - type name
+               - isAutogenerated: 1
+               integer_cst 32 0 - type size
+               integer_cst -2147483648 0 - min value
+               integer_cst 2147483647 0 - max value
+         integer_cst 24 2147483638 - operand
+       non_lvalue_expr 2147483640 - operand
+        var_decl gptr1 test42.cpp 49:8 2147483639 - 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
+       integer_cst 3 2147483640 - operand
+      non_lvalue_expr 2147483641 - arg
+       var_decl gptr1 test42.cpp 49:8 2147483640 - 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
+     integer_cst 0 2147483642 - operand
+  cleanup_point_expr test42.cpp 177:29 2147483645 - then
+   expr_stmt test42.cpp 177:29 2147483644 - operand
+    convert_expr 2147483643 - expresssion
+     modify_expr 2147483642 - operand
+      component_ref test42.cpp 177:20 2147483641 - operand
+       indirect_ref 2147483640 - object
+        var_decl gptr1 test42.cpp 49:8 2147483639 - ref
+        - 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
+       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
+      integer_cst 100 2147483641 - operand
diff --git a/test/test42-02.txt b/test/test42-02.txt
index 3e25310..0e1d92d 100644
--- a/test/test42-02.txt
+++ b/test/test42-02.txt
@@ -27,3 +27,5 @@ func14: pointer_type ptr1,
 func15: pointer_type ptr1, 
 func16: 
 func17: pointer_type ptr1, 
+func18: pointer_type ptr1, 
+func19: pointer_type ptr1, 
diff --git a/test/test42-03.txt b/test/test42-03.txt
index e85ccaf..0607707 100644
--- a/test/test42-03.txt
+++ b/test/test42-03.txt
@@ -1008,3 +1008,139 @@ type_decl int: ptr1,
 integer_cst 32: ptr1, 
 integer_cst -2147483648: ptr1, 
 integer_cst 2147483647: ptr1, 
+function_decl func18: 
+if_stmt : ptr1, 
+cleanup_point_expr : ptr1, 
+truth_andif_expr : ptr1, 
+ne_expr : ptr1, 
+integer_cst 0: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 0: ptr1, 
+ne_expr : ptr1, 
+integer_cst 0: ptr1, 
+call_expr : ptr1, 
+obj_type_ref : ptr1, 
+indirect_ref : ptr1, 
+pointer_plus_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl _vptr.Data1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+pointer_type : ptr1, 
+type_decl __vtbl_ptr_type: ptr1, 
+function_type : ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 24: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 3: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 0: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr1: 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, 
+integer_cst 100: ptr1, 
+function_decl func19: 
+if_stmt : ptr1, 
+cleanup_point_expr : ptr1, 
+truth_andif_expr : ptr1, 
+ne_expr : ptr1, 
+integer_cst 0: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 0: ptr1, 
+ne_expr : ptr1, 
+integer_cst 0: ptr1, 
+call_expr : ptr1, 
+obj_type_ref : ptr1, 
+indirect_ref : ptr1, 
+pointer_plus_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl _vptr.Data1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+pointer_type : ptr1, 
+type_decl __vtbl_ptr_type: ptr1, 
+function_type : ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 24: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 3: ptr1, 
+var_decl gptr1: ptr1, 
+integer_cst 64: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 0: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl gptr1: 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, 
+integer_cst 100: ptr1, 
diff --git a/test/test42.cpp b/test/test42.cpp
index 6501fd6..be42808 100644
--- a/test/test42.cpp
+++ b/test/test42.cpp
@@ -163,4 +163,18 @@ class Object1
         x = gptr2->val;
         y = gptr2->val;
     }
+
+    void func18(Data1 *ptr1) const
+    {
+        if (gptr1 && gptr1->getData6())
+            gptr1->val = 100;
+    }
+
+    void func19(Data1 *ptr1) const
+    {
+//        if (gptr1 && gptr1->getData6() && k == 200)
+        if (gptr1 && gptr1->getData6())
+            gptr1->val = 100;
+    }
+
 };