Update test 28. Update test results.

9 files changed, 686 insertions, 301 deletions

diff --git a/test/test22-02.txt b/test/test22-02.txt
index 3c33b1c..8a92b35 100644
--- a/test/test22-02.txt
+++ b/test/test22-02.txt
@@ -181,10 +181,6 @@ func1: pointer_type ptr1,
 func2: pointer_type ptr1, 
 func3: pointer_type ptr1, 
 func4: pointer_type ptr1, 
-test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:56:25: warning: Using parameter 'ptr1' without checking for null pointer
-         if (ptr1->ftest1() == 100)
-                         ^
 Data1: 
 __base_dtor : 
 __comp_dtor : 
diff --git a/test/test23-02.txt b/test/test23-02.txt
index a654d0d..b86fed9 100644
--- a/test/test23-02.txt
+++ b/test/test23-02.txt
@@ -179,44 +179,14 @@ ftest1:
 ftest2: pointer_type ptr0, 
 ftest3: pointer_type ptr0, 
 Object1: pointer_type ptr1, 
-test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:53:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 __base_ctor : pointer_type ptr1, 
-test23.cpp: In constructor 'Object1::Object1(Data1*)':
-test23.cpp:53:25: warning: Using parameter 'ptr1' without checking for null pointer
 __comp_ctor : pointer_type ptr1, 
 func1: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func1(Data1*)':
-test23.cpp:63:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 func2: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func2(Data1*)':
-test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 func3: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 func4: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func4(Data1*)':
-test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 func5: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:99:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 func6: pointer_type ptr1, 
-test23.cpp: In member function 'void Object1::func6(FuncPtr1)':
-test23.cpp:105:13: warning: Using parameter 'ptr1' without checking for null pointer
-         ptr1();
-             ^
 func7: pointer_type ptr1, 
 func8: pointer_type ptr1, 
 func9: pointer_type ptr2, 
diff --git a/test/test24-02.txt b/test/test24-02.txt
index eac8965..cbec826 100644
--- a/test/test24-02.txt
+++ b/test/test24-02.txt
@@ -2,10 +2,6 @@ ftest1:
 ftest2: pointer_type ptr0, 
 ftest3: pointer_type ptr0, 
 func1: pointer_type ptr1, 
-test24.c: In function 'func1':
-test24.c:33:5: warning: Using parameter 'ptr1' without checking for null pointer
-     ptr1();
-     ^
 func2: pointer_type ptr1, 
 func3: pointer_type ptr1, 
 func4: pointer_type ptr1, 
diff --git a/test/test25-02.txt b/test/test25-02.txt
index 5a1bb16..9ed47f6 100644
--- a/test/test25-02.txt
+++ b/test/test25-02.txt
@@ -9,8 +9,4 @@ ftest2: pointer_type ptr0,
 test1: 
 func1: pointer_type ptr1, 
 func2: pointer_type ptr1, 
-test25.cpp: In member function 'void Object1::func2(Data1*)':
-test25.cpp:50:14: warning: warning: possible null argument 'ptr1' where non-null required
-         test1(ptr1);
-              ^
 func3: pointer_type ptr1, 
diff --git a/test/test26-02.txt b/test/test26-02.txt
index 640a548..da4feb8 100644
--- a/test/test26-02.txt
+++ b/test/test26-02.txt
@@ -297,20 +297,8 @@ Data1:
 __base_dtor : 
 __comp_dtor : 
 func3: pointer_type ptr1, 
-test26.cpp: In member function 'void Object1::func3(Data1*)':
-test26.cpp:68:16: warning: Using parameter 'ptr1' without checking for null pointer
-         delete ptr1;
-                ^
 func4: pointer_type ptr1, 
-test26.cpp: In member function 'void Object1::func4(Data1*)':
-test26.cpp:77:16: warning: Using parameter 'ptr1' without checking for null pointer
-         delete ptr1;
-                ^
 func5: pointer_type ptr1, 
-test26.cpp: In static member function 'static void Object1::func5(Data2*)':
-test26.cpp:85:16: warning: Using parameter 'ptr1' without checking for null pointer
-         delete ptr1;
-                ^
 func6: pointer_type ptr1, 
 func7: pointer_type ptr1, 
 func8: pointer_type ptr1, 
diff --git a/test/test28-01.txt b/test/test28-01.txt
index 7f8e037..e2509d2 100644
--- a/test/test28-01.txt
+++ b/test/test28-01.txt
@@ -3953,8 +3953,8 @@ function_decl func10 test28.cpp 232:10
           field_decl tmp2 test28.cpp 17:12 - field
           - unsigned
            integer_cst 64 - decl size
-     cleanup_point_expr test28.cpp 259:61 - statement
-      expr_stmt test28.cpp 259:61 - operand
+     cleanup_point_expr test28.cpp 259:57 - statement
+      expr_stmt test28.cpp 259:57 - operand
        call_expr test28.cpp 259:35 - expresssion
         addr_expr - function
          function_decl paranuckerInternalTest test28.cpp 12:6 - operand
@@ -3971,8 +3971,8 @@ function_decl func10 test28.cpp 232:10
           - stringLength: 10
         nop_expr - arg
          addr_expr - operand
-          string_cst ptr1 - operand
-          - stringLength: 5
+          string_cst - operand
+          - stringLength: 1
      cleanup_point_expr test28.cpp 260:64 - statement
       expr_stmt test28.cpp 260:64 - operand
        call_expr test28.cpp 260:35 - expresssion
@@ -3993,8 +3993,8 @@ function_decl func10 test28.cpp 232:10
          addr_expr - operand
           string_cst - operand
           - stringLength: 1
-     cleanup_point_expr test28.cpp 261:65 - statement
-      expr_stmt test28.cpp 261:65 - operand
+     cleanup_point_expr test28.cpp 261:61 - statement
+      expr_stmt test28.cpp 261:61 - operand
        call_expr test28.cpp 261:35 - expresssion
         addr_expr - function
          function_decl paranuckerInternalTest test28.cpp 12:6 - operand
@@ -4011,8 +4011,8 @@ function_decl func10 test28.cpp 232:10
           - stringLength: 14
         nop_expr - arg
          addr_expr - operand
-          string_cst ptr1 - operand
-          - stringLength: 5
+          string_cst - operand
+          - stringLength: 1
      cleanup_point_expr test28.cpp 262:65 - statement
       expr_stmt test28.cpp 262:65 - operand
        call_expr test28.cpp 262:35 - expresssion
@@ -4036,3 +4036,503 @@ function_decl func10 test28.cpp 232:10
   block - operand
    var_decl ptr2 test28.cpp 234:16 - block vars
    - isUsed: 1
+function_decl func11 test28.cpp 266:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test28.cpp 14:7 - type name
+   - isAutogenerated: 1
+   field_decl tmp1 test28.cpp 16:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   field_decl tmp2 test28.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test28.cpp 15:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test28.cpp 14:7 - type name
+     - isAutogenerated: 1
+     field_decl tmp1 test28.cpp 16:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     field_decl tmp2 test28.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test28.cpp 15:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test28.cpp 3:8 - type name
+      - isAutogenerated: 1
+      field_decl val test28.cpp 5:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test28.cpp 6:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test28.cpp 7:14 - field
+      - signed
+       integer_cst 96 - decl size
+      type_decl Data1 test28.cpp 4:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test28.cpp 267:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test28.cpp 266:28 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test28.cpp 14:7 - type name
+    - isAutogenerated: 1
+    field_decl tmp1 test28.cpp 16:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl tmp2 test28.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test28.cpp 15:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test28.cpp 266:24 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test28.cpp 3:8 - type name
+    - isAutogenerated: 1
+    field_decl val test28.cpp 5:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test28.cpp 6:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test28.cpp 7:14 - field
+    - signed
+     integer_cst 96 - decl size
+    type_decl Data1 test28.cpp 4:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+  if_stmt test28.cpp 268:9 - statement
+   eq_expr test28.cpp 268:14 - condition
+    - isUsed: 1
+    parm_decl ptr1 test28.cpp 266:24 - operand
+     pointer_type - decl type
+      record_type - nested type
+       type_decl Data1 test28.cpp 3:8 - type name
+       - isAutogenerated: 1
+       field_decl val test28.cpp 5:9 - field
+       - signed
+        integer_cst 32 - decl size
+       field_decl ptrval test28.cpp 6:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       field_decl arr test28.cpp 7:14 - field
+       - signed
+        integer_cst 96 - decl size
+       type_decl Data1 test28.cpp 4:1 - field
+       - isAutogenerated: 1
+     integer_cst 64 - parm size
+    integer_cst 0 - operand
+   statement_list - then
+    cleanup_point_expr test28.cpp 270:61 - statement
+     expr_stmt test28.cpp 270:61 - operand
+      call_expr test28.cpp 270:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownVars - operand
+         - stringLength: 10
+       nop_expr - arg
+        addr_expr - operand
+         string_cst ptr1 - operand
+         - stringLength: 5
+    cleanup_point_expr test28.cpp 271:64 - statement
+     expr_stmt test28.cpp 271:64 - operand
+      call_expr test28.cpp 271:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownNonNullVars - operand
+         - stringLength: 17
+       nop_expr - arg
+        addr_expr - operand
+         string_cst - operand
+         - stringLength: 1
+    cleanup_point_expr test28.cpp 272:65 - statement
+     expr_stmt test28.cpp 272:65 - operand
+      call_expr test28.cpp 272:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownNullVars - operand
+         - stringLength: 14
+       nop_expr - arg
+        addr_expr - operand
+         string_cst ptr1 - operand
+         - stringLength: 5
+    cleanup_point_expr test28.cpp 273:69 - statement
+     expr_stmt test28.cpp 273:69 - operand
+      call_expr test28.cpp 273:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst needCheckNullVars - operand
+         - stringLength: 18
+       nop_expr - arg
+        addr_expr - operand
+         string_cst ptr1 - operand
+         - stringLength: 5
+    return_expr test28.cpp 274:13 - statement
+  cleanup_point_expr test28.cpp 276:57 - statement
+   expr_stmt test28.cpp 276:57 - operand
+    call_expr test28.cpp 276:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownVars - operand
+       - stringLength: 10
+     nop_expr - arg
+      addr_expr - operand
+       string_cst ptr1 - operand
+       - stringLength: 5
+  cleanup_point_expr test28.cpp 277:64 - statement
+   expr_stmt test28.cpp 277:64 - operand
+    call_expr test28.cpp 277:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNonNullVars - operand
+       - stringLength: 17
+     nop_expr - arg
+      addr_expr - operand
+       string_cst ptr1 - operand
+       - stringLength: 5
+  cleanup_point_expr test28.cpp 278:57 - statement
+   expr_stmt test28.cpp 278:57 - operand
+    call_expr test28.cpp 278:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNullVars - operand
+       - stringLength: 14
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test28.cpp 279:61 - statement
+   expr_stmt test28.cpp 279:61 - operand
+    call_expr test28.cpp 279:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst needCheckNullVars - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test28.cpp 281:20 - statement
+   expr_stmt test28.cpp 281:20 - operand
+    convert_expr - expresssion
+     modify_expr - operand
+      - isUsed: 1
+      parm_decl ptr1 test28.cpp 266:24 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test28.cpp 3:8 - type name
+         - isAutogenerated: 1
+         field_decl val test28.cpp 5:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test28.cpp 6:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         field_decl arr test28.cpp 7:14 - field
+         - signed
+          integer_cst 96 - decl size
+         type_decl Data1 test28.cpp 4:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+      component_ref test28.cpp 281:16 - operand
+       indirect_ref - object
+        nop_expr - ref
+         - isUsed: 1
+         parm_decl this test28.cpp 266:28 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Object1 test28.cpp 14:7 - type name
+            - isAutogenerated: 1
+            field_decl tmp1 test28.cpp 16:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl tmp2 test28.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Object1 test28.cpp 15:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl tmp1 test28.cpp 16:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+  cleanup_point_expr test28.cpp 282:53 - statement
+   expr_stmt test28.cpp 282:53 - operand
+    call_expr test28.cpp 282:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownVars - operand
+       - stringLength: 10
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test28.cpp 283:60 - statement
+   expr_stmt test28.cpp 283:60 - operand
+    call_expr test28.cpp 283:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNonNullVars - operand
+       - stringLength: 17
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test28.cpp 284:57 - statement
+   expr_stmt test28.cpp 284:57 - operand
+    call_expr test28.cpp 284:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst knownNullVars - operand
+       - stringLength: 14
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  cleanup_point_expr test28.cpp 285:61 - statement
+   expr_stmt test28.cpp 285:61 - operand
+    call_expr test28.cpp 285:31 - expresssion
+     addr_expr - function
+      function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      addr_expr - operand
+       string_cst = - operand
+       - stringLength: 2
+     nop_expr - arg
+      addr_expr - operand
+       string_cst needCheckNullVars - operand
+       - stringLength: 18
+     nop_expr - arg
+      addr_expr - operand
+       string_cst - operand
+       - stringLength: 1
+  if_stmt test28.cpp 287:9 - statement
+   eq_expr test28.cpp 287:14 - condition
+    - isUsed: 1
+    parm_decl ptr1 test28.cpp 266:24 - operand
+     pointer_type - decl type
+      record_type - nested type
+       type_decl Data1 test28.cpp 3:8 - type name
+       - isAutogenerated: 1
+       field_decl val test28.cpp 5:9 - field
+       - signed
+        integer_cst 32 - decl size
+       field_decl ptrval test28.cpp 6:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       field_decl arr test28.cpp 7:14 - field
+       - signed
+        integer_cst 96 - decl size
+       type_decl Data1 test28.cpp 4:1 - field
+       - isAutogenerated: 1
+     integer_cst 64 - parm size
+    integer_cst 0 - operand
+   statement_list - then
+    cleanup_point_expr test28.cpp 289:57 - statement
+     expr_stmt test28.cpp 289:57 - operand
+      call_expr test28.cpp 289:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownVars - operand
+         - stringLength: 10
+       nop_expr - arg
+        addr_expr - operand
+         string_cst - operand
+         - stringLength: 1
+    cleanup_point_expr test28.cpp 290:64 - statement
+     expr_stmt test28.cpp 290:64 - operand
+      call_expr test28.cpp 290:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownNonNullVars - operand
+         - stringLength: 17
+       nop_expr - arg
+        addr_expr - operand
+         string_cst - operand
+         - stringLength: 1
+    cleanup_point_expr test28.cpp 291:61 - statement
+     expr_stmt test28.cpp 291:61 - operand
+      call_expr test28.cpp 291:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst knownNullVars - operand
+         - stringLength: 14
+       nop_expr - arg
+        addr_expr - operand
+         string_cst - operand
+         - stringLength: 1
+    cleanup_point_expr test28.cpp 292:65 - statement
+     expr_stmt test28.cpp 292:65 - operand
+      call_expr test28.cpp 292:35 - expresssion
+       addr_expr - function
+        function_decl paranuckerInternalTest test28.cpp 12:6 - operand
+        - isExternal: 1
+        - isPublic: 1
+         function_type - function type
+       nop_expr - arg
+        addr_expr - operand
+         string_cst = - operand
+         - stringLength: 2
+       nop_expr - arg
+        addr_expr - operand
+         string_cst needCheckNullVars - operand
+         - stringLength: 18
+       nop_expr - arg
+        addr_expr - operand
+         string_cst - operand
+         - stringLength: 1
+    return_expr test28.cpp 293:13 - statement
diff --git a/test/test28-02.txt b/test/test28-02.txt
index fbcbf1c..b2f138d 100644
--- a/test/test28-02.txt
+++ b/test/test28-02.txt
@@ -1,249 +1,11 @@
 func1: pointer_type ptr1, 
 func2: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func2(Data1*)':
-test28.cpp:32:31: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                               ^
-test28.cpp:34:31: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-         paranuckerInternalTest("=", "needCheckNullVars", "");
-                               ^
 func3: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func3(Data1*)':
-test28.cpp:42:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:44:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:50:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
 func4: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func4(Data1*)':
-test28.cpp:65:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:71:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:73:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
 func5: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func5(Data1*)':
-test28.cpp:86:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:88:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:95:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:100:31: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                               ^
 func6: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func6(Data1*)':
-test28.cpp:109:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:111:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:117:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:122:31: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                               ^
-test28.cpp:124:31: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-         paranuckerInternalTest("=", "needCheckNullVars", "");
-                               ^
 func7: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func7(Data1*)':
-test28.cpp:133:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:139:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:141:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:146:31: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                               ^
 func8: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func8(Data1*)':
-test28.cpp:155:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:157:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:164:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:169:31: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                               ^
-test28.cpp:170:31: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-         paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                               ^
-test28.cpp:171:31: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-         paranuckerInternalTest("=", "needCheckNullVars", "");
-                               ^
 func9: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func9(Data1*)':
-test28.cpp:179:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:181:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:185:39: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-                 paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                       ^
-test28.cpp:187:39: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-                 paranuckerInternalTest("=", "needCheckNullVars", "");
-                                       ^
-test28.cpp:190:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:192:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:196:39: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-                 paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                       ^
-test28.cpp:198:39: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-                 paranuckerInternalTest("=", "needCheckNullVars", "");
-                                       ^
-test28.cpp:205:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:210:39: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-                 paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                       ^
-test28.cpp:211:39: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-                 paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                       ^
-test28.cpp:212:39: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-                 paranuckerInternalTest("=", "needCheckNullVars", "");
-                                       ^
-test28.cpp:216:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:222:39: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-                 paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                       ^
 func10: pointer_type ptr1, 
-test28.cpp: In member function 'void Object1::func10(Data1*)':
-test28.cpp:242:35: warning: warning: internal collections 'knownNonNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
-                                   ^
-test28.cpp:244:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
-test28.cpp:256:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:261:35: warning: warning: internal collections 'knownNullVars' is different.
-want: ptr1,
- get: 
-             paranuckerInternalTest("=", "knownNullVars", "ptr1");
-                                   ^
-test28.cpp:262:35: warning: warning: internal collections 'needCheckNullVars' is different.
-want: 
- get: ptr1,
-             paranuckerInternalTest("=", "needCheckNullVars", "");
-                                   ^
+func11: pointer_type ptr1, 
diff --git a/test/test28-03.txt b/test/test28-03.txt
index fd18921..02c7636 100644
--- a/test/test28-03.txt
+++ b/test/test28-03.txt
@@ -1009,3 +1009,149 @@ integer_cst 96: ptr1,
 type_decl Data1: ptr1, 
 block : ptr1, 
 var_decl ptr2: ptr1, 
+function_decl func11: 
+statement_list : ptr1, 
+if_stmt : ptr1, 
+eq_expr : ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+field_decl arr: ptr1, 
+integer_cst 96: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl paranuckerInternalTest: ptr1, 
+return_expr : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+convert_expr : 
+modify_expr : 
+parm_decl ptr1: 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data1: 
+integer_cst 64: 
+component_ref : 
+indirect_ref : 
+parm_decl this: 
+pointer_type : 
+record_type : 
+type_decl Object1: 
+field_decl tmp1: 
+integer_cst 64: 
+field_decl tmp2: 
+integer_cst 64: 
+type_decl Object1: 
+integer_cst 64: 
+field_decl tmp1: 
+integer_cst 64: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : ptr1, 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+if_stmt : ptr1, 
+eq_expr : 
+parm_decl ptr1: 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+field_decl arr: 
+integer_cst 96: 
+type_decl Data1: 
+integer_cst 64: 
+integer_cst 0: 
+statement_list : 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+cleanup_point_expr : 
+expr_stmt : 
+call_expr : 
+addr_expr : 
+function_decl paranuckerInternalTest: 
+return_expr : 
diff --git a/test/test28.cpp b/test/test28.cpp
index 50d649d..17ee86d 100644
--- a/test/test28.cpp
+++ b/test/test28.cpp
@@ -256,10 +256,41 @@ class Object1
             paranuckerInternalTest("=", "knownNullVars", "ptr1");
             paranuckerInternalTest("=", "needCheckNullVars", "ptr1");
             ptr1 = tmp2;
+            paranuckerInternalTest("=", "knownVars", "");
+            paranuckerInternalTest("=", "knownNonNullVars", "");
+            paranuckerInternalTest("=", "knownNullVars", "");
+            paranuckerInternalTest("=", "needCheckNullVars", "");
+        }
+    }
+
+    void func11(Data1 *ptr1)
+    {
+        if (!ptr1)
+        {
             paranuckerInternalTest("=", "knownVars", "ptr1");
             paranuckerInternalTest("=", "knownNonNullVars", "");
             paranuckerInternalTest("=", "knownNullVars", "ptr1");
+            paranuckerInternalTest("=", "needCheckNullVars", "ptr1");
+            return;
+        }
+        paranuckerInternalTest("=", "knownVars", "ptr1");
+        paranuckerInternalTest("=", "knownNonNullVars", "ptr1");
+        paranuckerInternalTest("=", "knownNullVars", "");
+        paranuckerInternalTest("=", "needCheckNullVars", "");
+
+        ptr1 = tmp1;
+        paranuckerInternalTest("=", "knownVars", "");
+        paranuckerInternalTest("=", "knownNonNullVars", "");
+        paranuckerInternalTest("=", "knownNullVars", "");
+        paranuckerInternalTest("=", "needCheckNullVars", "");
+
+        if (!ptr1)
+        {
+            paranuckerInternalTest("=", "knownVars", "");
+            paranuckerInternalTest("=", "knownNonNullVars", "");
+            paranuckerInternalTest("=", "knownNullVars", "");
             paranuckerInternalTest("=", "needCheckNullVars", "");
+            return;
         }
     }
 };