Update test 23. Update test results.

21 files changed, 3387 insertions, 3014 deletions

diff --git a/test/test07-05.txt b/test/test07-05.txt
index d308ba0..9b63bb9 100644
--- a/test/test07-05.txt
+++ b/test/test07-05.txt
@@ -652,87 +652,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __base_ctor : 
 bind_expr : __arg, __fct, 
@@ -741,87 +741,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __comp_ctor : 
 statement_list : __arg, __fct, 
@@ -1896,53 +1896,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -1951,53 +1951,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2035,53 +2035,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -2105,53 +2105,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2416,45 +2416,45 @@ cleanup_point_expr : aptr,
 expr_stmt : aptr, 
 convert_expr : aptr, 
 modify_expr : aptr, 
-component_ref : aptr, 
-indirect_ref : aptr, 
-parm_decl this: aptr, 
-pointer_type : aptr, 
-record_type : aptr, 
-type_decl Object1: aptr, 
-field_decl k: aptr, 
-integer_cst 32: aptr, 
-field_decl vec1: aptr, 
-integer_cst 192: aptr, 
-type_decl Object1: aptr, 
-integer_cst 64: aptr, 
-field_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_cst 3: aptr, 
+component_ref : aptr, this->k, 
+indirect_ref : aptr, this->k, 
+parm_decl this: aptr, this->k, 
+pointer_type : aptr, this->k, 
+record_type : aptr, this->k, 
+type_decl Object1: aptr, this->k, 
+field_decl k: aptr, this->k, 
+integer_cst 32: aptr, this->k, 
+field_decl vec1: aptr, this->k, 
+integer_cst 192: aptr, this->k, 
+type_decl Object1: aptr, this->k, 
+integer_cst 64: aptr, this->k, 
+field_decl k: aptr, this->k, 
+integer_cst 32: aptr, this->k, 
+integer_cst 3: aptr, this->k, 
 function_decl func5: 
 cleanup_point_expr : sptr, 
 expr_stmt : sptr, 
 convert_expr : sptr, 
 modify_expr : sptr, 
-component_ref : sptr, 
+component_ref : sptr, sptr->num, 
 test07.cpp: In member function 'void Object1::func5(Struct1*)':
 test07.cpp:43:15: warning: Using parameter 'sptr' without checking for null pointer
          sptr->num = 0;
                ^
-indirect_ref : sptr, 
-parm_decl sptr: sptr, 
-pointer_type : sptr, 
-record_type : sptr, 
-type_decl Struct1: sptr, 
-field_decl str: sptr, 
-integer_cst 64: sptr, 
-field_decl num: sptr, 
-integer_cst 32: sptr, 
-type_decl Struct1: sptr, 
-integer_cst 64: sptr, 
-field_decl num: sptr, 
-integer_cst 32: sptr, 
-integer_cst 0: sptr, 
+indirect_ref : sptr, sptr->num, 
+parm_decl sptr: sptr, sptr->num, 
+pointer_type : sptr, sptr->num, 
+record_type : sptr, sptr->num, 
+type_decl Struct1: sptr, sptr->num, 
+field_decl str: sptr, sptr->num, 
+integer_cst 64: sptr, sptr->num, 
+field_decl num: sptr, sptr->num, 
+integer_cst 32: sptr, sptr->num, 
+type_decl Struct1: sptr, sptr->num, 
+integer_cst 64: sptr, sptr->num, 
+field_decl num: sptr, sptr->num, 
+integer_cst 32: sptr, sptr->num, 
+integer_cst 0: sptr, sptr->num, 
 function_decl func6: 
 statement_list : sptr, 
 if_stmt : sptr, 
@@ -2475,21 +2475,21 @@ cleanup_point_expr : sptr,
 expr_stmt : 
 convert_expr : 
 modify_expr : 
-component_ref : 
-indirect_ref : 
-parm_decl sptr: 
-pointer_type : 
-record_type : 
-type_decl Struct1: 
-field_decl str: 
-integer_cst 64: 
-field_decl num: 
-integer_cst 32: 
-type_decl Struct1: 
-integer_cst 64: 
-field_decl num: 
-integer_cst 32: 
-integer_cst 0: 
+component_ref : sptr->num, 
+indirect_ref : sptr->num, 
+parm_decl sptr: sptr->num, 
+pointer_type : sptr->num, 
+record_type : sptr->num, 
+type_decl Struct1: sptr->num, 
+field_decl str: sptr->num, 
+integer_cst 64: sptr->num, 
+field_decl num: sptr->num, 
+integer_cst 32: sptr->num, 
+type_decl Struct1: sptr->num, 
+integer_cst 64: sptr->num, 
+field_decl num: sptr->num, 
+integer_cst 32: sptr->num, 
+integer_cst 0: sptr->num, 
 function_decl func7: 
 statement_list : sptr, 
 if_stmt : sptr, 
@@ -2543,40 +2543,40 @@ cleanup_point_expr : sptr,
 expr_stmt : sptr, 
 convert_expr : sptr, 
 modify_expr : sptr, 
-component_ref : sptr, 
-indirect_ref : sptr, 
-parm_decl this: sptr, 
-pointer_type : sptr, 
-record_type : sptr, 
-type_decl Object1: sptr, 
-field_decl k: sptr, 
-integer_cst 32: sptr, 
-field_decl vec1: sptr, 
-integer_cst 192: sptr, 
-type_decl Object1: sptr, 
-integer_cst 64: sptr, 
-field_decl k: sptr, 
-integer_cst 32: sptr, 
-integer_cst 10: sptr, 
-cleanup_point_expr : sptr, 
-expr_stmt : sptr, 
-convert_expr : sptr, 
-modify_expr : sptr, 
-component_ref : sptr, 
-indirect_ref : sptr, 
-parm_decl this: sptr, 
-pointer_type : sptr, 
-record_type : sptr, 
-type_decl Object1: sptr, 
-field_decl k: sptr, 
-integer_cst 32: sptr, 
-field_decl vec1: sptr, 
-integer_cst 192: sptr, 
-type_decl Object1: sptr, 
-integer_cst 64: sptr, 
-field_decl k: sptr, 
-integer_cst 32: sptr, 
-integer_cst 20: sptr, 
+component_ref : sptr, this->k, 
+indirect_ref : sptr, this->k, 
+parm_decl this: sptr, this->k, 
+pointer_type : sptr, this->k, 
+record_type : sptr, this->k, 
+type_decl Object1: sptr, this->k, 
+field_decl k: sptr, this->k, 
+integer_cst 32: sptr, this->k, 
+field_decl vec1: sptr, this->k, 
+integer_cst 192: sptr, this->k, 
+type_decl Object1: sptr, this->k, 
+integer_cst 64: sptr, this->k, 
+field_decl k: sptr, this->k, 
+integer_cst 32: sptr, this->k, 
+integer_cst 10: sptr, this->k, 
+cleanup_point_expr : sptr, this->k, 
+expr_stmt : sptr, this->k, 
+convert_expr : sptr, this->k, 
+modify_expr : sptr, this->k, 
+component_ref : sptr, this->k, 
+indirect_ref : sptr, this->k, 
+parm_decl this: sptr, this->k, 
+pointer_type : sptr, this->k, 
+record_type : sptr, this->k, 
+type_decl Object1: sptr, this->k, 
+field_decl k: sptr, this->k, 
+integer_cst 32: sptr, this->k, 
+field_decl vec1: sptr, this->k, 
+integer_cst 192: sptr, this->k, 
+type_decl Object1: sptr, this->k, 
+integer_cst 64: sptr, this->k, 
+field_decl k: sptr, this->k, 
+integer_cst 32: sptr, this->k, 
+integer_cst 20: sptr, this->k, 
 function_decl fill: 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
@@ -2865,7 +2865,6 @@ call_expr : __p,
 addr_expr : __p, 
 function_decl operator new: __p, 
 integer_cst 8: __p, 
-non_lvalue_expr : __p, 
 var_decl : __p, 
 cond_expr : __p, 
 ne_expr : __p, 
@@ -2892,7 +2891,6 @@ call_expr : __p,
 addr_expr : __p, 
 function_decl operator delete: __p, 
 var_decl : __p, 
-non_lvalue_expr : __p, 
 var_decl : __p, 
 var_decl : __p, 
 var_decl : __p, 
diff --git a/test/test08-03.txt b/test/test08-03.txt
index cb31abf..565d6ad 100644
--- a/test/test08-03.txt
+++ b/test/test08-03.txt
@@ -43,19 +43,19 @@ cleanup_point_expr : ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl this: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Object1: ptr2, 
-field_decl k: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Object1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl k: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 0: ptr2, 
+component_ref : ptr2, this->k, 
+indirect_ref : ptr2, this->k, 
+parm_decl this: ptr2, this->k, 
+pointer_type : ptr2, this->k, 
+record_type : ptr2, this->k, 
+type_decl Object1: ptr2, this->k, 
+field_decl k: ptr2, this->k, 
+integer_cst 32: ptr2, this->k, 
+type_decl Object1: ptr2, this->k, 
+integer_cst 64: ptr2, this->k, 
+field_decl k: ptr2, this->k, 
+integer_cst 32: ptr2, this->k, 
+integer_cst 0: ptr2, this->k, 
 cleanup_point_expr : ptr2, 
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
@@ -123,19 +123,19 @@ cleanup_point_expr :
 expr_stmt : 
 convert_expr : 
 modify_expr : 
-component_ref : 
-indirect_ref : 
-parm_decl this: 
-pointer_type : 
-record_type : 
-type_decl Object1: 
-field_decl k: 
-integer_cst 32: 
-type_decl Object1: 
-integer_cst 64: 
-field_decl k: 
-integer_cst 32: 
-integer_cst 0: 
+component_ref : this->k, 
+indirect_ref : this->k, 
+parm_decl this: this->k, 
+pointer_type : this->k, 
+record_type : this->k, 
+type_decl Object1: this->k, 
+field_decl k: this->k, 
+integer_cst 32: this->k, 
+type_decl Object1: this->k, 
+integer_cst 64: this->k, 
+field_decl k: this->k, 
+integer_cst 32: this->k, 
+integer_cst 0: this->k, 
 return_expr : ptr4, 
 cleanup_point_expr : ptr4, 
 expr_stmt : 
diff --git a/test/test11-03.txt b/test/test11-03.txt
index ac5cfff..f7c4b03 100644
--- a/test/test11-03.txt
+++ b/test/test11-03.txt
@@ -31,19 +31,19 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 200: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 200: ptr1->val, ptr2, 
 function_decl func2: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -77,41 +77,41 @@ cleanup_point_expr : ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 200: ptr2, 
-return_expr : ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 200: ptr1->val, ptr2, 
+return_expr : ptr1->val, ptr2, 
 cleanup_point_expr : ptr1, ptr2, 
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test11.cpp: In member function 'void Object1::func2(Data1*, Data1*)':
 test11.cpp:29:15: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1->val = 300;
                ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 300: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 300: ptr1, ptr1->val, ptr2, 
 function_decl func3: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -149,22 +149,22 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test11.cpp:39:15: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1->val = 200;
                ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 200: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 200: ptr1, ptr1->val, ptr2, 
 function_decl func4: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -202,22 +202,22 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test11.cpp:49:15: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1->val = 200;
                ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 200: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 200: ptr1, ptr1->val, ptr2, 
 function_decl func5: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -277,36 +277,36 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : 
 convert_expr : 
 modify_expr : 
-component_ref : 
-indirect_ref : 
-parm_decl ptr1: 
-pointer_type : 
-record_type : 
-type_decl Data1: 
-field_decl val: 
-integer_cst 32: 
-type_decl Data1: 
-integer_cst 64: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 300: 
-cleanup_point_expr : ptr1, ptr2, 
-expr_stmt : 
-convert_expr : 
-modify_expr : 
-component_ref : 
-indirect_ref : 
-parm_decl ptr2: 
-pointer_type : 
-record_type : 
-type_decl Data1: 
-field_decl val: 
-integer_cst 32: 
-type_decl Data1: 
-integer_cst 64: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 400: 
+component_ref : ptr1->val, 
+indirect_ref : ptr1->val, 
+parm_decl ptr1: ptr1->val, 
+pointer_type : ptr1->val, 
+record_type : ptr1->val, 
+type_decl Data1: ptr1->val, 
+field_decl val: ptr1->val, 
+integer_cst 32: ptr1->val, 
+type_decl Data1: ptr1->val, 
+integer_cst 64: ptr1->val, 
+field_decl val: ptr1->val, 
+integer_cst 32: ptr1->val, 
+integer_cst 300: ptr1->val, 
+cleanup_point_expr : ptr1, ptr1->val, ptr2, 
+expr_stmt : ptr1->val, 
+convert_expr : ptr1->val, 
+modify_expr : ptr1->val, 
+component_ref : ptr1->val, ptr2->val, 
+indirect_ref : ptr1->val, ptr2->val, 
+parm_decl ptr2: ptr1->val, ptr2->val, 
+pointer_type : ptr1->val, ptr2->val, 
+record_type : ptr1->val, ptr2->val, 
+type_decl Data1: ptr1->val, ptr2->val, 
+field_decl val: ptr1->val, ptr2->val, 
+integer_cst 32: ptr1->val, ptr2->val, 
+type_decl Data1: ptr1->val, ptr2->val, 
+integer_cst 64: ptr1->val, ptr2->val, 
+field_decl val: ptr1->val, ptr2->val, 
+integer_cst 32: ptr1->val, ptr2->val, 
+integer_cst 400: ptr1->val, ptr2->val, 
 function_decl func6: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -366,40 +366,40 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test11.cpp: In member function 'void Object1::func6(Data1*, Data1*)':
 test11.cpp:70:15: warning: Using parameter 'ptr1' without checking for null pointer
          ptr1->val = 300;
                ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 300: ptr1, ptr2, 
-cleanup_point_expr : ptr1, ptr2, 
-expr_stmt : ptr1, ptr2, 
-convert_expr : ptr1, ptr2, 
-modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 300: ptr1, ptr1->val, ptr2, 
+cleanup_point_expr : ptr1, ptr1->val, ptr2, 
+expr_stmt : ptr1, ptr1->val, ptr2, 
+convert_expr : ptr1, ptr1->val, ptr2, 
+modify_expr : ptr1, ptr1->val, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, ptr2->val, 
 test11.cpp:71:15: warning: Using parameter 'ptr2' without checking for null pointer
          ptr2->val = 400;
                ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr2: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 400: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr2->val, 
+parm_decl ptr2: ptr1, ptr1->val, ptr2, ptr2->val, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr2->val, 
+record_type : ptr1, ptr1->val, ptr2, ptr2->val, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr2->val, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 400: ptr1, ptr1->val, ptr2, ptr2->val, 
diff --git a/test/test12-03.txt b/test/test12-03.txt
index d9fc97d..e5eddd8 100644
--- a/test/test12-03.txt
+++ b/test/test12-03.txt
@@ -211,42 +211,42 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test12.cpp:30:19: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->val = 200;
                    ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 200: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 200: ptr1, ptr1->val, ptr2, 
 cleanup_point_expr : ptr1, ptr2, 
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr2, ptr2->val, 
 test12.cpp:34:19: warning: Using parameter 'ptr2' without checking for null pointer
              ptr2->val = 300;
                    ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr2: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 300: ptr1, ptr2, 
+indirect_ref : ptr1, ptr2, ptr2->val, 
+parm_decl ptr2: ptr1, ptr2, ptr2->val, 
+pointer_type : ptr1, ptr2, ptr2->val, 
+record_type : ptr1, ptr2, ptr2->val, 
+type_decl Data1: ptr1, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr2, ptr2->val, 
+type_decl Data1: ptr1, ptr2, ptr2->val, 
+integer_cst 64: ptr1, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr2, ptr2->val, 
+integer_cst 300: ptr1, ptr2, ptr2->val, 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
diff --git a/test/test16-03.txt b/test/test16-03.txt
index 0501f80..62539e9 100644
--- a/test/test16-03.txt
+++ b/test/test16-03.txt
@@ -27,18 +27,18 @@ integer_cst 32: ptr2,
 integer_cst 100: ptr2, 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 200: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+identifier_node Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 200: ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func2: 
 bind_expr : ptr1, ptr2, 
@@ -69,36 +69,36 @@ integer_cst 32: ptr2,
 integer_cst 100: ptr2, 
 statement_list : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 200: ptr2, 
-return_expr : ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+identifier_node Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 200: ptr1->val, ptr2, 
+return_expr : ptr1->val, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test16.c: In function 'func2':
 test16.c:26:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 300;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 300: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 300: ptr1, ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
@@ -133,21 +133,21 @@ integer_cst 32: ptr1, ptr2,
 integer_cst 100: ptr1, ptr2, 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test16.c:36:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 200;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 200: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 200: ptr1, ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func4: 
 bind_expr : ptr1, ptr2, 
@@ -182,21 +182,21 @@ integer_cst 32: ptr1, ptr2,
 integer_cst 100: ptr1, ptr2, 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test16.c:46:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 200;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 200: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 200: ptr1, ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
@@ -251,31 +251,31 @@ integer_cst 32:
 integer_cst 200: 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : 
-indirect_ref : 
-parm_decl ptr1: 
-pointer_type : 
-record_type : 
-identifier_node Data1: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 64: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 300: 
-modify_expr : ptr1, ptr2, 
-component_ref : 
-indirect_ref : 
-parm_decl ptr2: 
-pointer_type : 
-record_type : 
-identifier_node Data1: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 64: 
-field_decl val: 
-integer_cst 32: 
-integer_cst 400: 
+component_ref : ptr1->val, 
+indirect_ref : ptr1->val, 
+parm_decl ptr1: ptr1->val, 
+pointer_type : ptr1->val, 
+record_type : ptr1->val, 
+identifier_node Data1: ptr1->val, 
+field_decl val: ptr1->val, 
+integer_cst 32: ptr1->val, 
+integer_cst 64: ptr1->val, 
+field_decl val: ptr1->val, 
+integer_cst 32: ptr1->val, 
+integer_cst 300: ptr1->val, 
+modify_expr : ptr1, ptr1->val, ptr2, 
+component_ref : ptr1->val, ptr2->val, 
+indirect_ref : ptr1->val, ptr2->val, 
+parm_decl ptr2: ptr1->val, ptr2->val, 
+pointer_type : ptr1->val, ptr2->val, 
+record_type : ptr1->val, ptr2->val, 
+identifier_node Data1: ptr1->val, ptr2->val, 
+field_decl val: ptr1->val, ptr2->val, 
+integer_cst 32: ptr1->val, ptr2->val, 
+integer_cst 64: ptr1->val, ptr2->val, 
+field_decl val: ptr1->val, ptr2->val, 
+integer_cst 32: ptr1->val, ptr2->val, 
+integer_cst 400: ptr1->val, ptr2->val, 
 block : ptr1, ptr2, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
@@ -330,36 +330,36 @@ integer_cst 32: ptr1,
 integer_cst 200: ptr1, 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test16.c: In function 'func6':
 test16.c:67:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 300;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 300: ptr1, ptr2, 
-modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 300: ptr1, ptr1->val, ptr2, 
+modify_expr : ptr1, ptr1->val, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, ptr2->val, 
 test16.c:68:9: warning: Using parameter 'ptr2' without checking for null pointer
      ptr2->val = 400;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr2: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 400: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr2->val, 
+parm_decl ptr2: ptr1, ptr1->val, ptr2, ptr2->val, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr2->val, 
+record_type : ptr1, ptr1->val, ptr2, ptr2->val, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr2->val, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr2->val, 
+integer_cst 400: ptr1, ptr1->val, ptr2, ptr2->val, 
 block : ptr1, ptr2, 
diff --git a/test/test17-03.txt b/test/test17-03.txt
index 829c655..fa5fb56 100644
--- a/test/test17-03.txt
+++ b/test/test17-03.txt
@@ -22,18 +22,18 @@ integer_cst 2147483647: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst 0: ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+identifier_node Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 test17.c: In function 'func2':
 test17.c:18:14: warning: comparison between pointer and integer
@@ -65,28 +65,28 @@ integer_cst 2147483647: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst 0: ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
-return_expr : ptr1, ptr2, 
-modify_expr : ptr2, 
-result_decl : ptr2, 
-integer_type : ptr2, 
-type_decl int: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst -2147483648: ptr2, 
-integer_cst 2147483647: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 0: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+identifier_node Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
+return_expr : ptr1, ptr1->val, ptr2, 
+modify_expr : ptr1->val, ptr2, 
+result_decl : ptr1->val, ptr2, 
+integer_type : ptr1->val, ptr2, 
+type_decl int: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst -2147483648: ptr1->val, ptr2, 
+integer_cst 2147483647: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 0: ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 test17.c: In function 'func3':
 test17.c:26:14: warning: comparison between pointer and integer
@@ -118,31 +118,31 @@ integer_cst 2147483647: ptr2,
 integer_cst 32: ptr2, 
 integer_cst 0: ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test17.c:28:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 100: ptr1, ptr2, 
-return_expr : ptr1, ptr2, 
-modify_expr : ptr1, ptr2, 
-result_decl : ptr1, ptr2, 
-integer_type : ptr1, ptr2, 
-type_decl int: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst -2147483648: ptr1, ptr2, 
-integer_cst 2147483647: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 0: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 100: ptr1, ptr1->val, ptr2, 
+return_expr : ptr1, ptr1->val, ptr2, 
+modify_expr : ptr1, ptr1->val, ptr2, 
+result_decl : ptr1, ptr1->val, ptr2, 
+integer_type : ptr1, ptr1->val, ptr2, 
+type_decl int: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst -2147483648: ptr1, ptr1->val, ptr2, 
+integer_cst 2147483647: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 0: ptr1, ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func4: 
 bind_expr : ptr1, ptr2, 
@@ -169,22 +169,22 @@ integer_cst 64: ptr1, ptr2,
 integer_cst 0: ptr1, ptr2, 
 return_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test17.c: In function 'func4':
 test17.c:40:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
          ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-identifier_node Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 100: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 100: ptr1, ptr1->val, ptr2, 
 block : ptr1, ptr2, 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
@@ -212,16 +212,16 @@ integer_cst 64: ptr2,
 integer_cst 0: ptr2, 
 return_expr : 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+identifier_node Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
 block : ptr1, ptr2, 
diff --git a/test/test18-03.txt b/test/test18-03.txt
index 9f099c5..51f550f 100644
--- a/test/test18-03.txt
+++ b/test/test18-03.txt
@@ -25,19 +25,19 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
 function_decl func2: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -65,29 +65,29 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
-return_expr : ptr1, ptr2, 
-init_expr : ptr2, 
-result_decl : ptr2, 
-integer_type : ptr2, 
-type_decl int: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst -2147483648: ptr2, 
-integer_cst 2147483647: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 0: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
+return_expr : ptr1, ptr1->val, ptr2, 
+init_expr : ptr1->val, ptr2, 
+result_decl : ptr1->val, ptr2, 
+integer_type : ptr1->val, ptr2, 
+type_decl int: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst -2147483648: ptr1->val, ptr2, 
+integer_cst 2147483647: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 0: ptr1->val, ptr2, 
 function_decl func3: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -115,33 +115,33 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test18.cpp: In function 'int func3(Data1*, Data1*)':
 test18.cpp:28:11: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
            ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 100: ptr1, ptr2, 
-return_expr : ptr1, ptr2, 
-init_expr : ptr1, ptr2, 
-result_decl : ptr1, ptr2, 
-integer_type : ptr1, ptr2, 
-type_decl int: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst -2147483648: ptr1, ptr2, 
-integer_cst 2147483647: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 0: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 100: ptr1, ptr1->val, ptr2, 
+return_expr : ptr1, ptr1->val, ptr2, 
+init_expr : ptr1, ptr1->val, ptr2, 
+result_decl : ptr1, ptr1->val, ptr2, 
+integer_type : ptr1, ptr1->val, ptr2, 
+type_decl int: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst -2147483648: ptr1, ptr1->val, ptr2, 
+integer_cst 2147483647: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 0: ptr1, ptr1->val, ptr2, 
 function_decl func4: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -170,23 +170,23 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr1, ptr2, 
 convert_expr : ptr1, ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr1, ptr2, 
+component_ref : ptr1, ptr1->val, ptr2, 
 test18.cpp: In function 'void func4(Data1*, Data1*)':
 test18.cpp:40:11: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
            ^
-indirect_ref : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-record_type : ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-type_decl Data1: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-field_decl val: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 100: ptr1, ptr2, 
+indirect_ref : ptr1, ptr1->val, ptr2, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, 
+pointer_type : ptr1, ptr1->val, ptr2, 
+record_type : ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+type_decl Data1: ptr1, ptr1->val, ptr2, 
+integer_cst 64: ptr1, ptr1->val, ptr2, 
+field_decl val: ptr1, ptr1->val, ptr2, 
+integer_cst 32: ptr1, ptr1->val, ptr2, 
+integer_cst 100: ptr1, ptr1->val, ptr2, 
 function_decl func5: 
 statement_list : ptr1, ptr2, 
 if_stmt : ptr1, ptr2, 
@@ -217,16 +217,16 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-integer_cst 64: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : ptr1->val, ptr2, 
+indirect_ref : ptr1->val, ptr2, 
+parm_decl ptr1: ptr1->val, ptr2, 
+pointer_type : ptr1->val, ptr2, 
+record_type : ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+type_decl Data1: ptr1->val, ptr2, 
+integer_cst 64: ptr1->val, ptr2, 
+field_decl val: ptr1->val, ptr2, 
+integer_cst 32: ptr1->val, ptr2, 
+integer_cst 100: ptr1->val, ptr2, 
diff --git a/test/test19-03.txt b/test/test19-03.txt
index cfc3af8..d8f6c80 100644
--- a/test/test19-03.txt
+++ b/test/test19-03.txt
@@ -22,27 +22,27 @@ cleanup_point_expr : ptr1, ptr2, ptr3,
 expr_stmt : ptr1, ptr2, ptr3, 
 convert_expr : ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : , ptr1, ptr2, ptr3, 
 test19.cpp: In function 'int func2(Data1*, Data1*)':
 test19.cpp:16:11: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 100;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+integer_cst 100: , ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 64: , ptr1, ptr2, ptr3, 
+parm_decl ptr1: , ptr1, ptr2, ptr3, 
+pointer_type : , ptr1, ptr2, ptr3, 
+record_type : , ptr1, ptr2, ptr3, 
+type_decl Data1: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+type_decl Data1: , ptr1, ptr2, ptr3, 
+block : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -56,12 +56,12 @@ cleanup_point_expr : ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 var_decl ptr3: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -86,12 +86,12 @@ cleanup_point_expr : ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 if_stmt : ptr1, ptr2, ptr3, 
 truth_andif_expr : ptr1, ptr2, ptr3, 
 eq_expr : ptr1, ptr2, ptr3, 
@@ -118,19 +118,19 @@ cleanup_point_expr : ptr1, ptr3,
 expr_stmt : ptr1, ptr3, 
 convert_expr : ptr1, ptr3, 
 modify_expr : ptr1, ptr3, 
-component_ref : ptr1, ptr3, 
-indirect_ref : ptr1, ptr3, 
-parm_decl ptr2: ptr1, ptr3, 
-pointer_type : ptr1, ptr3, 
-record_type : ptr1, ptr3, 
-type_decl Data1: ptr1, ptr3, 
-field_decl val: ptr1, ptr3, 
-integer_cst 32: ptr1, ptr3, 
-type_decl Data1: ptr1, ptr3, 
-integer_cst 64: ptr1, ptr3, 
-field_decl val: ptr1, ptr3, 
-integer_cst 32: ptr1, ptr3, 
-integer_cst 200: ptr1, ptr3, 
+component_ref : ptr1, ptr2->val, ptr3, 
+indirect_ref : ptr1, ptr2->val, ptr3, 
+parm_decl ptr2: ptr1, ptr2->val, ptr3, 
+pointer_type : ptr1, ptr2->val, ptr3, 
+record_type : ptr1, ptr2->val, ptr3, 
+type_decl Data1: ptr1, ptr2->val, ptr3, 
+field_decl val: ptr1, ptr2->val, ptr3, 
+integer_cst 32: ptr1, ptr2->val, ptr3, 
+type_decl Data1: ptr1, ptr2->val, ptr3, 
+integer_cst 64: ptr1, ptr2->val, ptr3, 
+field_decl val: ptr1, ptr2->val, ptr3, 
+integer_cst 32: ptr1, ptr2->val, ptr3, 
+integer_cst 200: ptr1, ptr2->val, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -182,23 +182,23 @@ cleanup_point_expr : ptr1, ptr2,
 expr_stmt : ptr2, 
 convert_expr : ptr2, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-type_decl Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-type_decl Data1: ptr2, 
-block : ptr1, ptr2, 
-var_decl ptr3: ptr2, 
+integer_cst 64: , ptr2, 
+parm_decl ptr1: , ptr2, 
+pointer_type : , ptr2, 
+record_type : , ptr2, 
+type_decl Data1: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+type_decl Data1: , ptr2, 
+block : , ptr1, ptr2, 
+var_decl ptr3: , ptr2, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -239,27 +239,27 @@ cleanup_point_expr : ptr1, ptr2, ptr3,
 expr_stmt : ptr1, ptr2, ptr3, 
 convert_expr : ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : , ptr1, ptr2, ptr3, 
 test19.cpp: In function 'int func6(Data1*, Data1*)':
 test19.cpp:52:11: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 100;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+integer_cst 100: , ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 64: , ptr1, ptr2, ptr3, 
+parm_decl ptr1: , ptr1, ptr2, ptr3, 
+pointer_type : , ptr1, ptr2, ptr3, 
+record_type : , ptr1, ptr2, ptr3, 
+type_decl Data1: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+type_decl Data1: , ptr1, ptr2, ptr3, 
+block : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
 function_decl func7: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -310,46 +310,46 @@ cleanup_point_expr : ptr1, ptr2, ptr3,
 expr_stmt : ptr1, ptr2, ptr3, 
 convert_expr : ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : ptr1, ptr1->val, ptr2, ptr3, 
 test19.cpp: In function 'int func7(Data1*, Data1*)':
 test19.cpp:66:11: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
-cleanup_point_expr : ptr1, ptr2, ptr3, 
-expr_stmt : ptr1, ptr2, ptr3, 
-convert_expr : ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr3, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, ptr3, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr3, 
+record_type : ptr1, ptr1->val, ptr2, ptr3, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 100: ptr1, ptr1->val, ptr2, ptr3, 
+cleanup_point_expr : ptr1, ptr1->val, ptr2, ptr3, 
+expr_stmt : ptr1, ptr1->val, ptr2, ptr3, 
+convert_expr : ptr1, ptr1->val, ptr2, ptr3, 
+modify_expr : ptr1, ptr1->val, ptr2, ptr3, 
+component_ref : , ptr1, ptr1->val, ptr2, ptr3, 
 test19.cpp:67:11: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 200;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 200: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 200: , ptr1, ptr1->val, ptr2, ptr3, 
 var_decl c: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_type : ptr1, ptr2, ptr3, 
-type_decl int: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst -2147483648: ptr1, ptr2, ptr3, 
-integer_cst 2147483647: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl c: ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_type : , ptr1, ptr1->val, ptr2, ptr3, 
+type_decl int: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst -2147483648: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 2147483647: , ptr1, ptr1->val, ptr2, ptr3, 
+block : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl c: , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
 function_decl func8: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -400,43 +400,43 @@ cleanup_point_expr : ptr1, ptr2, ptr3,
 expr_stmt : ptr1, ptr2, ptr3, 
 convert_expr : ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : ptr1, ptr1->val, ptr2, ptr3, 
 test19.cpp: In function 'int func8(Data1*, Data1*)':
 test19.cpp:81:11: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-type_decl Data1: ptr1, ptr2, ptr3, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
-cleanup_point_expr : ptr1, ptr2, ptr3, 
-expr_stmt : ptr1, ptr2, ptr3, 
-convert_expr : ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr3, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, ptr3, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr3, 
+record_type : ptr1, ptr1->val, ptr2, ptr3, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+type_decl Data1: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 100: ptr1, ptr1->val, ptr2, ptr3, 
+cleanup_point_expr : ptr1, ptr1->val, ptr2, ptr3, 
+expr_stmt : ptr1, ptr1->val, ptr2, ptr3, 
+convert_expr : ptr1, ptr1->val, ptr2, ptr3, 
+modify_expr : ptr1, ptr1->val, ptr2, ptr3, 
+component_ref : , ptr1, ptr1->val, ptr2, ptr3, 
 test19.cpp:82:11: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 200;
            ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 200: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 200: , ptr1, ptr1->val, ptr2, ptr3, 
 var_decl c: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_type : ptr1, ptr2, ptr3, 
-type_decl int: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst -2147483648: ptr1, ptr2, ptr3, 
-integer_cst 2147483647: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl c: ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_type : , ptr1, ptr1->val, ptr2, ptr3, 
+type_decl int: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst -2147483648: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 2147483647: , ptr1, ptr1->val, ptr2, ptr3, 
+block : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl c: , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
diff --git a/test/test20-03.txt b/test/test20-03.txt
index c76a426..9e65d0a 100644
--- a/test/test20-03.txt
+++ b/test/test20-03.txt
@@ -18,26 +18,26 @@ statement_list : ptr1, ptr2,
 decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : , ptr1, ptr2, ptr3, 
 test20.c: In function 'func2':
 test20.c:16:9: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 100;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+integer_cst 100: , ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-identifier_node Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 64: , ptr1, ptr2, ptr3, 
+parm_decl ptr1: , ptr1, ptr2, ptr3, 
+pointer_type : , ptr1, ptr2, ptr3, 
+record_type : , ptr1, ptr2, ptr3, 
+identifier_node Data1: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+block : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -48,12 +48,12 @@ ne_expr : ptr1, ptr2, ptr3,
 var_decl ptr3: ptr1, ptr2, ptr3, 
 integer_cst 0: ptr1, ptr2, ptr3, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 var_decl ptr3: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -74,12 +74,12 @@ ne_expr : ptr1, ptr2, ptr3,
 var_decl ptr3: ptr1, ptr2, ptr3, 
 integer_cst 0: ptr1, ptr2, ptr3, 
 modify_expr : ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 cond_expr : ptr1, ptr2, ptr3, 
 truth_andif_expr : ptr1, ptr2, ptr3, 
 eq_expr : ptr1, ptr2, ptr3, 
@@ -101,18 +101,18 @@ integer_cst 32: ptr1, ptr2, ptr3,
 integer_cst 64: ptr1, ptr2, ptr3, 
 integer_cst 0: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr3, 
-component_ref : ptr1, ptr3, 
-indirect_ref : ptr1, ptr3, 
-parm_decl ptr2: ptr1, ptr3, 
-pointer_type : ptr1, ptr3, 
-record_type : ptr1, ptr3, 
-identifier_node Data1: ptr1, ptr3, 
-field_decl val: ptr1, ptr3, 
-integer_cst 32: ptr1, ptr3, 
-integer_cst 64: ptr1, ptr3, 
-field_decl val: ptr1, ptr3, 
-integer_cst 32: ptr1, ptr3, 
-integer_cst 200: ptr1, ptr3, 
+component_ref : ptr1, ptr2->val, ptr3, 
+indirect_ref : ptr1, ptr2->val, ptr3, 
+parm_decl ptr2: ptr1, ptr2->val, ptr3, 
+pointer_type : ptr1, ptr2->val, ptr3, 
+record_type : ptr1, ptr2->val, ptr3, 
+identifier_node Data1: ptr1, ptr2->val, ptr3, 
+field_decl val: ptr1, ptr2->val, ptr3, 
+integer_cst 32: ptr1, ptr2->val, ptr3, 
+integer_cst 64: ptr1, ptr2->val, ptr3, 
+field_decl val: ptr1, ptr2->val, ptr3, 
+integer_cst 32: ptr1, ptr2->val, ptr3, 
+integer_cst 200: ptr1, ptr2->val, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -159,22 +159,22 @@ integer_cst 0: ptr1, ptr2,
 decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr2, 
 modify_expr : ptr1, ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr3: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst 100: ptr2, 
+component_ref : , ptr2, 
+indirect_ref : , ptr2, 
+var_decl ptr3: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+integer_cst 100: , ptr2, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr2, 
-parm_decl ptr1: ptr2, 
-pointer_type : ptr2, 
-record_type : ptr2, 
-identifier_node Data1: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-block : ptr1, ptr2, 
-var_decl ptr3: ptr2, 
+integer_cst 64: , ptr2, 
+parm_decl ptr1: , ptr2, 
+pointer_type : , ptr2, 
+record_type : , ptr2, 
+identifier_node Data1: , ptr2, 
+field_decl val: , ptr2, 
+integer_cst 32: , ptr2, 
+block : , ptr1, ptr2, 
+var_decl ptr3: , ptr2, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -211,26 +211,26 @@ integer_cst 0: ptr1, ptr2,
 decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : , ptr1, ptr2, ptr3, 
 test20.c: In function 'func6':
 test20.c:52:9: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 100;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+integer_cst 100: , ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-identifier_node Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 64: , ptr1, ptr2, ptr3, 
+parm_decl ptr1: , ptr1, ptr2, ptr3, 
+pointer_type : , ptr1, ptr2, ptr3, 
+record_type : , ptr1, ptr2, ptr3, 
+identifier_node Data1: , ptr1, ptr2, ptr3, 
+field_decl val: , ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr2, ptr3, 
+block : , ptr1, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr2, ptr3, 
 function_decl func7: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -276,42 +276,42 @@ identifier_node Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : ptr1, ptr1->val, ptr2, ptr3, 
 test20.c: In function 'func7':
 test20.c:66:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-identifier_node Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr3, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, ptr3, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr3, 
+record_type : ptr1, ptr1->val, ptr2, ptr3, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 100: ptr1, ptr1->val, ptr2, ptr3, 
+modify_expr : ptr1, ptr1->val, ptr2, ptr3, 
+component_ref : , ptr1, ptr1->val, ptr2, ptr3, 
 test20.c:67:9: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 200;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 200: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 200: , ptr1, ptr1->val, ptr2, ptr3, 
 var_decl c: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_type : ptr1, ptr2, ptr3, 
-type_decl int: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst -2147483648: ptr1, ptr2, ptr3, 
-integer_cst 2147483647: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl c: ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_type : , ptr1, ptr1->val, ptr2, ptr3, 
+type_decl int: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst -2147483648: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 2147483647: , ptr1, ptr1->val, ptr2, ptr3, 
+block : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl c: , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
 function_decl func8: 
 bind_expr : ptr1, ptr2, 
 statement_list : ptr1, ptr2, 
@@ -357,39 +357,39 @@ identifier_node Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+component_ref : ptr1, ptr1->val, ptr2, ptr3, 
 test20.c: In function 'func8':
 test20.c:81:9: warning: Using parameter 'ptr1' without checking for null pointer
      ptr1->val = 100;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-parm_decl ptr1: ptr1, ptr2, ptr3, 
-pointer_type : ptr1, ptr2, ptr3, 
-record_type : ptr1, ptr2, ptr3, 
-identifier_node Data1: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 64: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 100: ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr1, ptr2, ptr3, 
+indirect_ref : ptr1, ptr1->val, ptr2, ptr3, 
+parm_decl ptr1: ptr1, ptr1->val, ptr2, ptr3, 
+pointer_type : ptr1, ptr1->val, ptr2, ptr3, 
+record_type : ptr1, ptr1->val, ptr2, ptr3, 
+identifier_node Data1: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 64: ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 100: ptr1, ptr1->val, ptr2, ptr3, 
+modify_expr : ptr1, ptr1->val, ptr2, ptr3, 
+component_ref : , ptr1, ptr1->val, ptr2, ptr3, 
 test20.c:82:9: warning: Using variable 'ptr3' without checking for null pointer
      ptr3->val = 200;
          ^
-indirect_ref : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-field_decl val: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 200: ptr1, ptr2, ptr3, 
+indirect_ref : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
+field_decl val: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 200: , ptr1, ptr1->val, ptr2, ptr3, 
 var_decl c: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_type : ptr1, ptr2, ptr3, 
-type_decl int: ptr1, ptr2, ptr3, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst -2147483648: ptr1, ptr2, ptr3, 
-integer_cst 2147483647: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl c: ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_type : , ptr1, ptr1->val, ptr2, ptr3, 
+type_decl int: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 32: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst -2147483648: , ptr1, ptr1->val, ptr2, ptr3, 
+integer_cst 2147483647: , ptr1, ptr1->val, ptr2, ptr3, 
+block : , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl c: , ptr1, ptr1->val, ptr2, ptr3, 
+var_decl ptr3: , ptr1, ptr1->val, ptr2, ptr3, 
diff --git a/test/test21-03.txt b/test/test21-03.txt
index 8c1c46c..010a570 100644
--- a/test/test21-03.txt
+++ b/test/test21-03.txt
@@ -62,53 +62,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -117,53 +117,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -201,53 +201,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -271,53 +271,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
diff --git a/test/test22-01.txt b/test/test22-01.txt
index aae2156..288dcc8 100644
--- a/test/test22-01.txt
+++ b/test/test22-01.txt
@@ -23022,7 +23022,7 @@ function_decl ftest2 test22.cpp 27:16
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl func1 test22.cpp 39:9
+function_decl func1 test22.cpp 37:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -23036,9 +23036,6 @@ function_decl func1 test22.cpp 39:9
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -23046,9 +23043,6 @@ function_decl func1 test22.cpp 39:9
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -23074,7 +23068,7 @@ function_decl func1 test22.cpp 39:9
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 40:5 - function result
+ result_decl test22.cpp 38:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -23085,20 +23079,17 @@ function_decl func1 test22.cpp 39:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 39:32 - argument
+ parm_decl this test22.cpp 37:32 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 39:28 - argument
+ parm_decl ptr1 test22.cpp 37:28 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -23118,8 +23109,8 @@ function_decl func1 test22.cpp 39:9
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 42:29 - code
-  var_decl vec1 test22.cpp 41:29 - operand
+ bind_expr test22.cpp 40:29 - code
+  var_decl vec1 test22.cpp 39:29 - operand
   - isUsed: 1
    integer_cst 192 - decl size
    record_type - var type
@@ -23153,37 +23144,37 @@ function_decl func1 test22.cpp 39:9
     type_decl difference_type /usr/include/c++/5/bits/stl_vector.h 237:30 - field
     type_decl allocator_type /usr/include/c++/5/bits/stl_vector.h 238:48 - field
   statement_list - operand
-   decl_expr test22.cpp 41:29 - statement
-    var_decl vec1 test22.cpp 41:29 - operand
+   decl_expr test22.cpp 39:29 - statement
+    var_decl vec1 test22.cpp 39:29 - operand
     - isUsed: 1
-   cleanup_point_expr test22.cpp 41:29 - statement
-    expr_stmt test22.cpp 41:29 - operand
-     call_expr test22.cpp 41:29 - expresssion
+   cleanup_point_expr test22.cpp 39:29 - statement
+    expr_stmt test22.cpp 39:29 - operand
+     call_expr test22.cpp 39:29 - expresssion
       addr_expr - function
        function_decl __comp_ctor  /usr/include/c++/5/bits/stl_vector.h 253:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       var_decl vec1 test22.cpp 41:29 - operand
+       var_decl vec1 test22.cpp 39:29 - operand
        - isUsed: 1
-   cleanup_stmt test22.cpp 41:29 - statement
+   cleanup_stmt test22.cpp 39:29 - statement
     statement_list - body
-     cleanup_point_expr test22.cpp 42:29 - statement
-      expr_stmt test22.cpp 42:29 - operand
-       call_expr test22.cpp 42:23 - expresssion
+     cleanup_point_expr test22.cpp 40:29 - statement
+      expr_stmt test22.cpp 40:29 - operand
+       call_expr test22.cpp 40:23 - expresssion
         addr_expr - function
          function_decl push_back /usr/include/c++/5/bits/stl_vector.h 913:7 - operand
          - isExternal: 1
          - isPublic: 1
           method_type - function type
         addr_expr - arg
-         var_decl vec1 test22.cpp 41:29 - operand
+         var_decl vec1 test22.cpp 39:29 - operand
          - isUsed: 1
         nop_expr - arg
          addr_expr - operand
           - isUsed: 1
-          parm_decl ptr1 test22.cpp 39:28 - operand
+          parm_decl ptr1 test22.cpp 37:28 - operand
            pointer_type - decl type
             record_type - nested type
              type_decl Data1 test22.cpp 6:8 - type name
@@ -23210,14 +23201,14 @@ function_decl func1 test22.cpp 39:9
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      var_decl vec1 test22.cpp 41:29 - operand
+      var_decl vec1 test22.cpp 39:29 - operand
       - isUsed: 1
-    var_decl vec1 test22.cpp 41:29 - decl
+    var_decl vec1 test22.cpp 39:29 - decl
     - isUsed: 1
   block - operand
-   var_decl vec1 test22.cpp 41:29 - block vars
+   var_decl vec1 test22.cpp 39:29 - block vars
    - isUsed: 1
-function_decl func2 test22.cpp 45:9
+function_decl func2 test22.cpp 43:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -23231,9 +23222,6 @@ function_decl func2 test22.cpp 45:9
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -23241,9 +23229,6 @@ function_decl func2 test22.cpp 45:9
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -23269,7 +23254,7 @@ function_decl func2 test22.cpp 45:9
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 46:5 - function result
+ result_decl test22.cpp 44:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -23280,20 +23265,17 @@ function_decl func2 test22.cpp 45:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 45:32 - argument
+ parm_decl this test22.cpp 43:32 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 45:28 - argument
+ parm_decl ptr1 test22.cpp 43:28 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -23313,13 +23295,13 @@ function_decl func2 test22.cpp 45:9
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 47:31 - code
-  var_decl ptr2 test22.cpp 47:16 - operand
+ bind_expr test22.cpp 45:31 - code
+  var_decl ptr2 test22.cpp 45:16 - operand
    integer_cst 64 - decl size
-   pointer_plus_expr test22.cpp 47:28 - initial
+   pointer_plus_expr test22.cpp 45:28 - initial
     nop_expr - operand
      - isUsed: 1
-     parm_decl ptr1 test22.cpp 45:28 - operand
+     parm_decl ptr1 test22.cpp 43:28 - operand
       pointer_type - decl type
        record_type - nested type
         type_decl Data1 test22.cpp 6:8 - type name
@@ -23358,11 +23340,11 @@ function_decl func2 test22.cpp 45:9
       integer_cst 64 - decl size
      type_decl Data1 test22.cpp 7:1 - field
      - isAutogenerated: 1
-  decl_expr test22.cpp 47:30 - operand
-   var_decl ptr2 test22.cpp 47:16 - operand
+  decl_expr test22.cpp 45:30 - operand
+   var_decl ptr2 test22.cpp 45:16 - operand
   block - operand
-   var_decl ptr2 test22.cpp 47:16 - block vars
-function_decl func3 test22.cpp 50:9
+   var_decl ptr2 test22.cpp 45:16 - block vars
+function_decl func3 test22.cpp 48:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -23376,9 +23358,6 @@ function_decl func3 test22.cpp 50:9
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -23386,9 +23365,6 @@ function_decl func3 test22.cpp 50:9
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -23414,7 +23390,7 @@ function_decl func3 test22.cpp 50:9
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 51:5 - function result
+ result_decl test22.cpp 49:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -23425,20 +23401,17 @@ function_decl func3 test22.cpp 50:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 50:26 - argument
+ parm_decl this test22.cpp 48:26 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 50:22 - argument
+ parm_decl ptr1 test22.cpp 48:22 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -23458,13 +23431,13 @@ function_decl func3 test22.cpp 50:9
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 53:26 - code
-  var_decl ptr2 test22.cpp 52:17 - operand
+ bind_expr test22.cpp 51:26 - code
+  var_decl ptr2 test22.cpp 50:17 - operand
   - isUsed: 1
    integer_cst 64 - decl size
    addr_expr - initial
     - isUsed: 1
-    parm_decl ptr1 test22.cpp 50:22 - operand
+    parm_decl ptr1 test22.cpp 48:22 - operand
      pointer_type - decl type
       record_type - nested type
        type_decl Data1 test22.cpp 6:8 - type name
@@ -23504,26 +23477,26 @@ function_decl func3 test22.cpp 50:9
       type_decl Data1 test22.cpp 7:1 - field
       - isAutogenerated: 1
   statement_list - operand
-   decl_expr test22.cpp 52:25 - statement
-    var_decl ptr2 test22.cpp 52:17 - operand
+   decl_expr test22.cpp 50:25 - statement
+    var_decl ptr2 test22.cpp 50:17 - operand
     - isUsed: 1
-   cleanup_point_expr test22.cpp 53:26 - statement
-    expr_stmt test22.cpp 53:26 - operand
+   cleanup_point_expr test22.cpp 51:26 - statement
+    expr_stmt test22.cpp 51:26 - operand
      convert_expr - expresssion
       modify_expr - operand
-       component_ref test22.cpp 53:18 - operand
+       component_ref test22.cpp 51:18 - operand
         indirect_ref - object
          indirect_ref - ref
-          var_decl ptr2 test22.cpp 52:17 - ref
+          var_decl ptr2 test22.cpp 50:17 - ref
           - isUsed: 1
         field_decl val test22.cpp 17:9 - field
         - signed
          integer_cst 32 - decl size
        integer_cst 10 - operand
   block - operand
-   var_decl ptr2 test22.cpp 52:17 - block vars
+   var_decl ptr2 test22.cpp 50:17 - block vars
    - isUsed: 1
-function_decl func4 test22.cpp 56:10
+function_decl func4 test22.cpp 54:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23532,9 +23505,6 @@ function_decl func4 test22.cpp 56:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -23542,9 +23512,6 @@ function_decl func4 test22.cpp 56:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -23570,25 +23537,22 @@ function_decl func4 test22.cpp 56:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 57:5 - function result
+ result_decl test22.cpp 55:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 56:33 - argument
+ parm_decl this test22.cpp 54:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 56:29 - argument
+ parm_decl ptr1 test22.cpp 54:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -23608,10 +23572,10 @@ function_decl func4 test22.cpp 56:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- if_stmt test22.cpp 58:9 - code
+ if_stmt test22.cpp 56:9 - code
   cleanup_point_expr - condition
-   eq_expr test22.cpp 58:28 - operand
-    call_expr test22.cpp 58:25 - operand
+   eq_expr test22.cpp 56:28 - operand
+    call_expr test22.cpp 56:25 - operand
      addr_expr - function
       function_decl ftest1 test22.cpp 22:9 - operand
       - isExternal: 1
@@ -23619,7 +23583,7 @@ function_decl func4 test22.cpp 56:10
        method_type - function type
      nop_expr - arg
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 56:29 - operand
+      parm_decl ptr1 test22.cpp 54:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -23640,7 +23604,7 @@ function_decl func4 test22.cpp 56:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
     integer_cst 100 - operand
-  return_expr test22.cpp 60:13 - then
+  return_expr test22.cpp 58:13 - then
 function_decl Data1 test22.cpp 6:8
 - isAutogenerated: 1
 - isPublic: 1
@@ -23702,7 +23666,7 @@ function_decl Data1 test22.cpp 6:8
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 66:24 - argument
+ parm_decl this test22.cpp 64:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23723,7 +23687,7 @@ function_decl Data1 test22.cpp 6:8
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- parm_decl __in_chrg test22.cpp 66:24 - argument
+ parm_decl __in_chrg test22.cpp 64:24 - argument
  - isAutogenerated: 1
   integer_type - decl type
   - precisionBits: 32
@@ -23750,7 +23714,7 @@ function_decl Data1 test22.cpp 6:8
         component_ref test22.cpp 6:8 - operand
          indirect_ref - object
           nop_expr - ref
-           parm_decl this test22.cpp 66:24 - operand
+           parm_decl this test22.cpp 64:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
@@ -23777,7 +23741,7 @@ function_decl Data1 test22.cpp 6:8
     modify_expr - expresssion
      indirect_ref - operand
       nop_expr - ref
-       parm_decl this test22.cpp 66:24 - operand
+       parm_decl this test22.cpp 64:24 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
@@ -23868,7 +23832,7 @@ function_decl __base_dtor  test22.cpp 6:8
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 66:24 - argument
+ parm_decl this test22.cpp 64:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23905,7 +23869,7 @@ function_decl __base_dtor  test22.cpp 6:8
         component_ref test22.cpp 6:8 - operand
          indirect_ref - object
           nop_expr - ref
-           parm_decl this test22.cpp 66:24 - operand
+           parm_decl this test22.cpp 64:24 - operand
            - isAutogenerated: 1
             pointer_type - decl type
              record_type - nested type
@@ -23932,7 +23896,7 @@ function_decl __base_dtor  test22.cpp 6:8
     modify_expr - operand
      indirect_ref - operand
       nop_expr - ref
-       parm_decl this test22.cpp 66:24 - operand
+       parm_decl this test22.cpp 64:24 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
@@ -24023,7 +23987,7 @@ function_decl __comp_dtor  test22.cpp 6:8
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 66:24 - argument
+ parm_decl this test22.cpp 64:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -24045,7 +24009,7 @@ function_decl __comp_dtor  test22.cpp 6:8
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-function_decl func5 test22.cpp 64:10
+function_decl func5 test22.cpp 62:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24054,9 +24018,6 @@ function_decl func5 test22.cpp 64:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24064,9 +24025,6 @@ function_decl func5 test22.cpp 64:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24092,25 +24050,22 @@ function_decl func5 test22.cpp 64:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 65:5 - function result
+ result_decl test22.cpp 63:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 64:27 - argument
+ parm_decl this test22.cpp 62:27 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 64:23 - argument
+ parm_decl ptr1 test22.cpp 62:23 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -24130,8 +24085,8 @@ function_decl func5 test22.cpp 64:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 66:25 - code
-  var_decl data test22.cpp 66:15 - operand
+ bind_expr test22.cpp 64:25 - code
+  var_decl data test22.cpp 64:15 - operand
   - isUsed: 1
    integer_cst 320 - decl size
    record_type - var type
@@ -24152,21 +24107,21 @@ function_decl func5 test22.cpp 64:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   statement_list - operand
-   decl_expr test22.cpp 66:24 - statement
-    var_decl data test22.cpp 66:15 - operand
+   decl_expr test22.cpp 64:24 - statement
+    var_decl data test22.cpp 64:15 - operand
     - isUsed: 1
-   cleanup_point_expr test22.cpp 66:24 - statement
-    expr_stmt test22.cpp 66:24 - operand
-     call_expr test22.cpp 66:24 - expresssion
+   cleanup_point_expr test22.cpp 64:24 - statement
+    expr_stmt test22.cpp 64:24 - operand
+     call_expr test22.cpp 64:24 - expresssion
       addr_expr - function
        function_decl __comp_ctor  test22.cpp 12:5 - operand
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       var_decl data test22.cpp 66:15 - operand
+       var_decl data test22.cpp 64:15 - operand
        - isUsed: 1
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 64:23 - arg
+      parm_decl ptr1 test22.cpp 62:23 - arg
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -24186,7 +24141,7 @@ function_decl func5 test22.cpp 64:10
          type_decl Data1 test22.cpp 7:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
-   cleanup_stmt test22.cpp 66:24 - statement
+   cleanup_stmt test22.cpp 64:24 - statement
     statement_list - body
     call_expr - expresssion
      addr_expr - function
@@ -24195,14 +24150,14 @@ function_decl func5 test22.cpp 64:10
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      var_decl data test22.cpp 66:15 - operand
+      var_decl data test22.cpp 64:15 - operand
       - isUsed: 1
-    var_decl data test22.cpp 66:15 - decl
+    var_decl data test22.cpp 64:15 - decl
     - isUsed: 1
   block - operand
-   var_decl data test22.cpp 66:15 - block vars
+   var_decl data test22.cpp 64:15 - block vars
    - isUsed: 1
-function_decl func6 test22.cpp 69:10
+function_decl func6 test22.cpp 67:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24211,9 +24166,6 @@ function_decl func6 test22.cpp 69:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24221,9 +24173,6 @@ function_decl func6 test22.cpp 69:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24249,25 +24198,22 @@ function_decl func6 test22.cpp 69:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 70:5 - function result
+ result_decl test22.cpp 68:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 69:33 - argument
+ parm_decl this test22.cpp 67:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 69:29 - argument
+ parm_decl ptr1 test22.cpp 67:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -24287,14 +24233,14 @@ function_decl func6 test22.cpp 69:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 73:28 - code
-  var_decl num test22.cpp 73:13 - operand
+ bind_expr test22.cpp 71:28 - code
+  var_decl num test22.cpp 71:13 - operand
    integer_cst 32 - decl size
-   component_ref test22.cpp 73:25 - initial
+   component_ref test22.cpp 71:25 - initial
     indirect_ref - object
      nop_expr - ref
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 69:29 - operand
+      parm_decl ptr1 test22.cpp 67:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -24326,11 +24272,11 @@ function_decl func6 test22.cpp 69:10
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
   statement_list - operand
-   if_stmt test22.cpp 71:9 - statement
-    eq_expr test22.cpp 71:14 - condition
+   if_stmt test22.cpp 69:9 - statement
+    eq_expr test22.cpp 69:14 - condition
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 69:29 - operand
+      parm_decl ptr1 test22.cpp 67:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -24351,12 +24297,12 @@ function_decl func6 test22.cpp 69:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-    return_expr test22.cpp 72:13 - then
-   decl_expr test22.cpp 73:25 - statement
-    var_decl num test22.cpp 73:13 - operand
+    return_expr test22.cpp 70:13 - then
+   decl_expr test22.cpp 71:25 - statement
+    var_decl num test22.cpp 71:13 - operand
   block - operand
-   var_decl num test22.cpp 73:13 - block vars
-function_decl func7 test22.cpp 76:10
+   var_decl num test22.cpp 71:13 - block vars
+function_decl func7 test22.cpp 74:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24365,9 +24311,6 @@ function_decl func7 test22.cpp 76:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24375,9 +24318,6 @@ function_decl func7 test22.cpp 76:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24403,25 +24343,22 @@ function_decl func7 test22.cpp 76:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 77:5 - function result
+ result_decl test22.cpp 75:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 76:33 - argument
+ parm_decl this test22.cpp 74:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 76:29 - argument
+ parm_decl ptr1 test22.cpp 74:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -24441,10 +24378,10 @@ function_decl func7 test22.cpp 76:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- if_stmt test22.cpp 78:9 - code
+ if_stmt test22.cpp 76:9 - code
   cleanup_point_expr - condition
-   eq_expr test22.cpp 78:33 - operand
-    call_expr test22.cpp 78:26 - operand
+   eq_expr test22.cpp 76:33 - operand
+    call_expr test22.cpp 76:26 - operand
      addr_expr - function
       function_decl ftest2 test22.cpp 27:16 - operand
       - isExternal: 1
@@ -24452,7 +24389,7 @@ function_decl func7 test22.cpp 76:10
        function_type - function type
      nop_expr - arg
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 76:29 - operand
+      parm_decl ptr1 test22.cpp 74:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -24473,8 +24410,8 @@ function_decl func7 test22.cpp 76:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
     integer_cst 200 - operand
-  return_expr test22.cpp 80:13 - then
-function_decl func8 test22.cpp 83:10
+  return_expr test22.cpp 78:13 - then
+function_decl func8 test22.cpp 81:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24483,9 +24420,6 @@ function_decl func8 test22.cpp 83:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24493,9 +24427,6 @@ function_decl func8 test22.cpp 83:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24521,25 +24452,22 @@ function_decl func8 test22.cpp 83:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 84:5 - function result
+ result_decl test22.cpp 82:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 83:33 - argument
+ parm_decl this test22.cpp 81:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 83:29 - argument
+ parm_decl ptr1 test22.cpp 81:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -24559,17 +24487,17 @@ function_decl func8 test22.cpp 83:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 90:30 - code
-  var_decl k test22.cpp 88:19 - operand
+ bind_expr test22.cpp 88:30 - code
+  var_decl k test22.cpp 86:19 - operand
    integer_cst 32 - decl size
-   array_ref test22.cpp 88:34 - initial
+   array_ref test22.cpp 86:34 - initial
     integer_cst 0 - low bound
     integer_cst 4 - element size
-    component_ref test22.cpp 88:29 - operand
+    component_ref test22.cpp 86:29 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl ptr1 test22.cpp 83:29 - operand
+       parm_decl ptr1 test22.cpp 81:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test22.cpp 6:8 - type name
@@ -24602,13 +24530,13 @@ function_decl func8 test22.cpp 83:10
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
   statement_list - operand
-   if_stmt test22.cpp 85:9 - statement
-    truth_orif_expr test22.cpp 85:37 - condition
-     truth_orif_expr test22.cpp 85:19 - operand
-      eq_expr test22.cpp 85:14 - operand
+   if_stmt test22.cpp 83:9 - statement
+    truth_orif_expr test22.cpp 83:37 - condition
+     truth_orif_expr test22.cpp 83:19 - operand
+      eq_expr test22.cpp 83:14 - operand
        nop_expr - operand
         - isUsed: 1
-        parm_decl ptr1 test22.cpp 83:29 - operand
+        parm_decl ptr1 test22.cpp 81:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test22.cpp 6:8 - type name
@@ -24629,12 +24557,12 @@ function_decl func8 test22.cpp 83:10
            - isAutogenerated: 1
          integer_cst 64 - parm size
        integer_cst 0 - operand
-      eq_expr test22.cpp 85:32 - operand
-       component_ref test22.cpp 85:28 - operand
+      eq_expr test22.cpp 83:32 - operand
+       component_ref test22.cpp 83:28 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl ptr1 test22.cpp 83:29 - operand
+          parm_decl ptr1 test22.cpp 81:29 - operand
            pointer_type - decl type
             record_type - nested type
              type_decl Data1 test22.cpp 6:8 - type name
@@ -24658,12 +24586,12 @@ function_decl func8 test22.cpp 83:10
         - signed
          integer_cst 32 - decl size
        integer_cst 3 - operand
-     eq_expr test22.cpp 85:47 - operand
-      component_ref test22.cpp 85:47 - operand
+     eq_expr test22.cpp 83:47 - operand
+      component_ref test22.cpp 83:47 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl ptr1 test22.cpp 83:29 - operand
+         parm_decl ptr1 test22.cpp 81:29 - operand
           pointer_type - decl type
            record_type - nested type
             type_decl Data1 test22.cpp 6:8 - type name
@@ -24687,17 +24615,17 @@ function_decl func8 test22.cpp 83:10
        - unsigned
         integer_cst 64 - decl size
       integer_cst 0 - operand
-    return_expr test22.cpp 86:13 - then
-   decl_expr test22.cpp 88:34 - statement
-    var_decl k test22.cpp 88:19 - operand
-   decl_expr test22.cpp 90:27 - statement
-    var_decl test1 test22.cpp 90:13 - operand
+    return_expr test22.cpp 84:13 - then
+   decl_expr test22.cpp 86:34 - statement
+    var_decl k test22.cpp 86:19 - operand
+   decl_expr test22.cpp 88:27 - statement
+    var_decl test1 test22.cpp 88:13 - operand
      integer_cst 32 - decl size
-     component_ref test22.cpp 90:27 - initial
+     component_ref test22.cpp 88:27 - initial
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl ptr1 test22.cpp 83:29 - operand
+        parm_decl ptr1 test22.cpp 81:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test22.cpp 6:8 - type name
@@ -24729,9 +24657,9 @@ function_decl func8 test22.cpp 83:10
       integer_cst -2147483648 - min value
       integer_cst 2147483647 - max value
   block - operand
-   var_decl k test22.cpp 88:19 - block vars
-   var_decl test1 test22.cpp 90:13 - block vars
-function_decl func9 test22.cpp 93:10
+   var_decl k test22.cpp 86:19 - block vars
+   var_decl test1 test22.cpp 88:13 - block vars
+function_decl func9 test22.cpp 91:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24740,9 +24668,6 @@ function_decl func9 test22.cpp 93:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24750,9 +24675,6 @@ function_decl func9 test22.cpp 93:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24778,25 +24700,22 @@ function_decl func9 test22.cpp 93:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 94:5 - function result
+ result_decl test22.cpp 92:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 93:33 - argument
+ parm_decl this test22.cpp 91:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 93:29 - argument
+ parm_decl ptr1 test22.cpp 91:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -24817,13 +24736,13 @@ function_decl func9 test22.cpp 93:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  if_stmt test22.cpp 95:9 - statement
+  if_stmt test22.cpp 93:9 - statement
    cleanup_point_expr - condition
-    truth_orif_expr test22.cpp 95:19 - operand
-     eq_expr test22.cpp 95:14 - operand
+    truth_orif_expr test22.cpp 93:19 - operand
+     eq_expr test22.cpp 93:14 - operand
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test22.cpp 93:29 - operand
+       parm_decl ptr1 test22.cpp 91:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test22.cpp 6:8 - type name
@@ -24844,18 +24763,18 @@ function_decl func9 test22.cpp 93:10
           - isAutogenerated: 1
         integer_cst 64 - parm size
       integer_cst 0 - operand
-     call_expr test22.cpp 95:38 - operand
+     call_expr test22.cpp 93:38 - operand
       addr_expr - function
        function_decl empty /usr/include/c++/5/bits/basic_string.h 3217:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test22.cpp 95:28 - operand
+       component_ref test22.cpp 93:28 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl ptr1 test22.cpp 93:29 - operand
+          parm_decl ptr1 test22.cpp 91:29 - operand
            pointer_type - decl type
             record_type - nested type
              type_decl Data1 test22.cpp 6:8 - type name
@@ -24878,22 +24797,22 @@ function_decl func9 test22.cpp 93:10
         field_decl str1 test22.cpp 20:17 - field
         - signed
          integer_cst 64 - decl size
-   return_expr test22.cpp 96:13 - then
-  cleanup_point_expr test22.cpp 97:22 - statement
-   expr_stmt test22.cpp 97:22 - operand
+   return_expr test22.cpp 94:13 - then
+  cleanup_point_expr test22.cpp 95:22 - statement
+   expr_stmt test22.cpp 95:22 - operand
     convert_expr - expresssion
-     call_expr test22.cpp 97:21 - operand
+     call_expr test22.cpp 95:21 - operand
       addr_expr - function
        function_decl operator[] /usr/include/c++/5/bits/basic_string.h 3249:7 - operand
        - isExternal: 1
        - isPublic: 1
         method_type - function type
       addr_expr - arg
-       component_ref test22.cpp 97:15 - operand
+       component_ref test22.cpp 95:15 - operand
         indirect_ref - object
          nop_expr - ref
           - isUsed: 1
-          parm_decl ptr1 test22.cpp 93:29 - operand
+          parm_decl ptr1 test22.cpp 91:29 - operand
            pointer_type - decl type
             record_type - nested type
              type_decl Data1 test22.cpp 6:8 - type name
@@ -24917,7 +24836,7 @@ function_decl func9 test22.cpp 93:10
         - signed
          integer_cst 64 - decl size
       integer_cst 0 - arg
-function_decl func10 test22.cpp 100:10
+function_decl func10 test22.cpp 98:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -24926,9 +24845,6 @@ function_decl func10 test22.cpp 100:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -24936,9 +24852,6 @@ function_decl func10 test22.cpp 100:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -24964,25 +24877,22 @@ function_decl func10 test22.cpp 100:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 101:5 - function result
+ result_decl test22.cpp 99:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 100:34 - argument
+ parm_decl this test22.cpp 98:34 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 100:30 - argument
+ parm_decl ptr1 test22.cpp 98:30 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -25002,13 +24912,13 @@ function_decl func10 test22.cpp 100:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 111:9 - code
-  var_decl ptr2 test22.cpp 102:16 - operand
+ bind_expr test22.cpp 109:9 - code
+  var_decl ptr2 test22.cpp 100:16 - operand
   - isUsed: 1
    integer_cst 64 - decl size
    nop_expr - initial
     - isUsed: 1
-    parm_decl ptr1 test22.cpp 100:30 - operand
+    parm_decl ptr1 test22.cpp 98:30 - operand
      pointer_type - decl type
       record_type - nested type
        type_decl Data1 test22.cpp 6:8 - type name
@@ -25047,17 +24957,17 @@ function_decl func10 test22.cpp 100:10
      type_decl Data1 test22.cpp 7:1 - field
      - isAutogenerated: 1
   statement_list - operand
-   decl_expr test22.cpp 102:23 - statement
-    var_decl ptr2 test22.cpp 102:16 - operand
+   decl_expr test22.cpp 100:23 - statement
+    var_decl ptr2 test22.cpp 100:16 - operand
     - isUsed: 1
-   bind_expr test22.cpp 111:9 - statement
-    if_stmt test22.cpp 103:9 - operand
+   bind_expr test22.cpp 109:9 - statement
+    if_stmt test22.cpp 101:9 - operand
      ne_expr - condition
-      var_decl ptr2 test22.cpp 102:16 - operand
+      var_decl ptr2 test22.cpp 100:16 - operand
       - isUsed: 1
       integer_cst 0 - operand
-     bind_expr test22.cpp 106:28 - then
-      var_decl k test22.cpp 105:17 - operand
+     bind_expr test22.cpp 104:28 - then
+      var_decl k test22.cpp 103:17 - operand
        integer_cst 32 - decl size
        integer_cst 10 - initial
        integer_type - var type
@@ -25069,18 +24979,18 @@ function_decl func10 test22.cpp 100:10
         integer_cst -2147483648 - min value
         integer_cst 2147483647 - max value
       statement_list - operand
-       cleanup_point_expr test22.cpp 105:21 - statement
-        decl_expr test22.cpp 105:21 - operand
-         var_decl k test22.cpp 105:17 - operand
-       cleanup_point_expr test22.cpp 106:28 - statement
-        expr_stmt test22.cpp 106:28 - operand
+       cleanup_point_expr test22.cpp 103:21 - statement
+        decl_expr test22.cpp 103:21 - operand
+         var_decl k test22.cpp 103:17 - operand
+       cleanup_point_expr test22.cpp 104:28 - statement
+        expr_stmt test22.cpp 104:28 - operand
          convert_expr - expresssion
           modify_expr - operand
-           component_ref test22.cpp 106:19 - operand
+           component_ref test22.cpp 104:19 - operand
             indirect_ref - object
              nop_expr - ref
               - isUsed: 1
-              parm_decl ptr1 test22.cpp 100:30 - operand
+              parm_decl ptr1 test22.cpp 98:30 - operand
                pointer_type - decl type
                 record_type - nested type
                  type_decl Data1 test22.cpp 6:8 - type name
@@ -25105,9 +25015,9 @@ function_decl func10 test22.cpp 100:10
              integer_cst 32 - decl size
            integer_cst 100 - operand
       block - operand
-       var_decl k test22.cpp 105:17 - block vars
-     cleanup_point_expr test22.cpp 110:19 - else
-      expr_stmt test22.cpp 110:19 - operand
+       var_decl k test22.cpp 103:17 - block vars
+     cleanup_point_expr test22.cpp 108:19 - else
+      expr_stmt test22.cpp 108:19 - operand
        convert_expr - expresssion
         modify_expr - operand
          var_decl k test22.cpp 33:5 - operand
@@ -25124,14 +25034,14 @@ function_decl func10 test22.cpp 100:10
          integer_cst 20 - operand
     block - operand
      block - sub block
-      var_decl k test22.cpp 105:17 - block vars
+      var_decl k test22.cpp 103:17 - block vars
   block - operand
-   var_decl ptr2 test22.cpp 102:16 - block vars
+   var_decl ptr2 test22.cpp 100:16 - block vars
    - isUsed: 1
    block - sub block
     block - sub block
-     var_decl k test22.cpp 105:17 - block vars
-function_decl func11 test22.cpp 114:10
+     var_decl k test22.cpp 103:17 - block vars
+function_decl func11 test22.cpp 112:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -25140,9 +25050,6 @@ function_decl func11 test22.cpp 114:10
   record_type - method base type
    type_decl Object1 test22.cpp 35:7 - type name
    - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
    type_decl Object1 test22.cpp 36:1 - field
    - isAutogenerated: 1
   tree_list - arg types
@@ -25150,9 +25057,6 @@ function_decl func11 test22.cpp 114:10
     record_type - nested type
      type_decl Object1 test22.cpp 35:7 - type name
      - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
      type_decl Object1 test22.cpp 36:1 - field
      - isAutogenerated: 1
    tree_list - chain
@@ -25178,25 +25082,22 @@ function_decl func11 test22.cpp 114:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test22.cpp 115:5 - function result
+ result_decl test22.cpp 113:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
- parm_decl this test22.cpp 114:34 - argument
+ parm_decl this test22.cpp 112:34 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
     type_decl Object1 test22.cpp 35:7 - type name
     - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
     type_decl Object1 test22.cpp 36:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 114:30 - argument
+ parm_decl ptr1 test22.cpp 112:30 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test22.cpp 6:8 - type name
@@ -25216,13 +25117,13 @@ function_decl func11 test22.cpp 114:10
     type_decl Data1 test22.cpp 7:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 118:28 - code
-  var_decl ptr2 test22.cpp 116:16 - operand
+ bind_expr test22.cpp 116:28 - code
+  var_decl ptr2 test22.cpp 114:16 - operand
   - isUsed: 1
    integer_cst 64 - decl size
    nop_expr - initial
     - isUsed: 1
-    parm_decl ptr1 test22.cpp 114:30 - operand
+    parm_decl ptr1 test22.cpp 112:30 - operand
      pointer_type - decl type
       record_type - nested type
        type_decl Data1 test22.cpp 6:8 - type name
@@ -25261,14 +25162,14 @@ function_decl func11 test22.cpp 114:10
      type_decl Data1 test22.cpp 7:1 - field
      - isAutogenerated: 1
   statement_list - operand
-   decl_expr test22.cpp 116:23 - statement
-    var_decl ptr2 test22.cpp 116:16 - operand
+   decl_expr test22.cpp 114:23 - statement
+    var_decl ptr2 test22.cpp 114:16 - operand
     - isUsed: 1
-   if_stmt test22.cpp 117:9 - statement
+   if_stmt test22.cpp 115:9 - statement
     ne_expr - condition
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 114:30 - operand
+      parm_decl ptr1 test22.cpp 112:30 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test22.cpp 6:8 - type name
@@ -25289,206 +25190,21 @@ function_decl func11 test22.cpp 114:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-    cleanup_point_expr test22.cpp 118:28 - then
-     expr_stmt test22.cpp 118:28 - operand
+    cleanup_point_expr test22.cpp 116:28 - then
+     expr_stmt test22.cpp 116:28 - operand
       convert_expr - expresssion
        modify_expr - operand
-        component_ref test22.cpp 118:19 - operand
+        component_ref test22.cpp 116:19 - operand
          indirect_ref - object
-          var_decl ptr2 test22.cpp 116:16 - ref
+          var_decl ptr2 test22.cpp 114:16 - ref
           - isUsed: 1
          field_decl val test22.cpp 17:9 - field
          - signed
           integer_cst 32 - decl size
         integer_cst 200 - operand
   block - operand
-   var_decl ptr2 test22.cpp 116:16 - block vars
+   var_decl ptr2 test22.cpp 114:16 - block vars
    - isUsed: 1
-function_decl func12 test22.cpp 121: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 test22.cpp 35:7 - type name
-   - isAutogenerated: 1
-   field_decl dataptr test22.cpp 37:12 - field
-   - unsigned
-    integer_cst 64 - decl size
-   type_decl Object1 test22.cpp 36:1 - field
-   - isAutogenerated: 1
-  tree_list - arg types
-   pointer_type - value
-    record_type - nested type
-     type_decl Object1 test22.cpp 35:7 - type name
-     - isAutogenerated: 1
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
-     type_decl Object1 test22.cpp 36:1 - field
-     - isAutogenerated: 1
-   tree_list - chain
-    pointer_type - value
-     record_type - nested type
-      type_decl Data1 test22.cpp 6:8 - type name
-      - isAutogenerated: 1
-      field_decl val test22.cpp 17:9 - field
-      - signed
-       integer_cst 32 - decl size
-      field_decl ptrval test22.cpp 18:12 - field
-      - unsigned
-       integer_cst 64 - decl size
-      field_decl arr test22.cpp 19:14 - field
-      - signed
-       integer_cst 96 - decl size
-      field_decl str1 test22.cpp 20:17 - field
-      - signed
-       integer_cst 64 - decl size
-      type_decl Data1 test22.cpp 7:1 - field
-      - isAutogenerated: 1
-    tree_list - chain
-     void_type - value
-      type_decl void <built-in> 0:0 - type name
-      - isAutogenerated: 1
- result_decl test22.cpp 122: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 test22.cpp 121:34 - argument
- - isAutogenerated: 1
-  pointer_type - decl type
-   record_type - nested type
-    type_decl Object1 test22.cpp 35:7 - type name
-    - isAutogenerated: 1
-    field_decl dataptr test22.cpp 37:12 - field
-    - unsigned
-     integer_cst 64 - decl size
-    type_decl Object1 test22.cpp 36:1 - field
-    - isAutogenerated: 1
-  integer_cst 64 - parm size
- - isUsed: 1
- parm_decl ptr1 test22.cpp 121:30 - argument
-  pointer_type - decl type
-   record_type - nested type
-    type_decl Data1 test22.cpp 6:8 - type name
-    - isAutogenerated: 1
-    field_decl val test22.cpp 17:9 - field
-    - signed
-     integer_cst 32 - decl size
-    field_decl ptrval test22.cpp 18:12 - field
-    - unsigned
-     integer_cst 64 - decl size
-    field_decl arr test22.cpp 19:14 - field
-    - signed
-     integer_cst 96 - decl size
-    field_decl str1 test22.cpp 20:17 - field
-    - signed
-     integer_cst 64 - decl size
-    type_decl Data1 test22.cpp 7:1 - field
-    - isAutogenerated: 1
-  integer_cst 64 - parm size
- statement_list - code
-  cleanup_point_expr test22.cpp 123:23 - statement
-   expr_stmt test22.cpp 123:23 - operand
-    convert_expr - expresssion
-     modify_expr - operand
-      component_ref test22.cpp 123:9 - operand
-       indirect_ref - object
-        nop_expr - ref
-         - isUsed: 1
-         parm_decl this test22.cpp 121:34 - operand
-         - isAutogenerated: 1
-          pointer_type - decl type
-           record_type - nested type
-            type_decl Object1 test22.cpp 35:7 - type name
-            - isAutogenerated: 1
-            field_decl dataptr test22.cpp 37:12 - field
-            - unsigned
-             integer_cst 64 - decl size
-            type_decl Object1 test22.cpp 36:1 - field
-            - isAutogenerated: 1
-          integer_cst 64 - parm size
-       field_decl dataptr test22.cpp 37:12 - field
-       - unsigned
-        integer_cst 64 - decl size
-      nop_expr - operand
-       - isUsed: 1
-       parm_decl ptr1 test22.cpp 121:30 - operand
-        pointer_type - decl type
-         record_type - nested type
-          type_decl Data1 test22.cpp 6:8 - type name
-          - isAutogenerated: 1
-          field_decl val test22.cpp 17:9 - field
-          - signed
-           integer_cst 32 - decl size
-          field_decl ptrval test22.cpp 18:12 - field
-          - unsigned
-           integer_cst 64 - decl size
-          field_decl arr test22.cpp 19:14 - field
-          - signed
-           integer_cst 96 - decl size
-          field_decl str1 test22.cpp 20:17 - field
-          - signed
-           integer_cst 64 - decl size
-          type_decl Data1 test22.cpp 7:1 - field
-          - isAutogenerated: 1
-        integer_cst 64 - parm size
-  if_stmt test22.cpp 124:9 - statement
-   ne_expr - condition
-    component_ref test22.cpp 124:13 - operand
-     indirect_ref - object
-      nop_expr - ref
-       - isUsed: 1
-       parm_decl this test22.cpp 121:34 - operand
-       - isAutogenerated: 1
-        pointer_type - decl type
-         record_type - nested type
-          type_decl Object1 test22.cpp 35:7 - type name
-          - isAutogenerated: 1
-          field_decl dataptr test22.cpp 37:12 - field
-          - unsigned
-           integer_cst 64 - decl size
-          type_decl Object1 test22.cpp 36:1 - field
-          - isAutogenerated: 1
-        integer_cst 64 - parm size
-     field_decl dataptr test22.cpp 37:12 - field
-     - unsigned
-      integer_cst 64 - decl size
-    integer_cst 0 - operand
-   cleanup_point_expr test22.cpp 126:27 - then
-    expr_stmt test22.cpp 126:27 - operand
-     convert_expr - expresssion
-      call_expr test22.cpp 126:25 - operand
-       addr_expr - function
-        function_decl ftest1 test22.cpp 22:9 - operand
-        - isExternal: 1
-        - isPublic: 1
-         method_type - function type
-       nop_expr - arg
-        - isUsed: 1
-        parm_decl ptr1 test22.cpp 121:30 - operand
-         pointer_type - decl type
-          record_type - nested type
-           type_decl Data1 test22.cpp 6:8 - type name
-           - isAutogenerated: 1
-           field_decl val test22.cpp 17:9 - field
-           - signed
-            integer_cst 32 - decl size
-           field_decl ptrval test22.cpp 18:12 - field
-           - unsigned
-            integer_cst 64 - decl size
-           field_decl arr test22.cpp 19:14 - field
-           - signed
-            integer_cst 96 - decl size
-           field_decl str1 test22.cpp 20:17 - field
-           - signed
-            integer_cst 64 - decl size
-           type_decl Data1 test22.cpp 7:1 - field
-           - isAutogenerated: 1
-         integer_cst 64 - parm size
 function_decl fill /usr/include/c++/5/bits/stl_algobase.h 736:5
 - isPublic: 1
  function_type - function type
diff --git a/test/test22-02.txt b/test/test22-02.txt
index 7c38a58..fcc3999 100644
--- a/test/test22-02.txt
+++ b/test/test22-02.txt
@@ -223,7 +223,7 @@ func2: pointer_type ptr1,
 func3: pointer_type ptr1, 
 func4: pointer_type ptr1, 
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:58:25: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:56:25: warning: Using parameter 'ptr1' without checking for null pointer
          if (ptr1->ftest1() == 100)
                          ^
 Data1: 
@@ -238,11 +238,6 @@ func8: pointer_type ptr1,
 func9: pointer_type ptr1, 
 func10: pointer_type ptr1, 
 func11: pointer_type ptr1, 
-func12: pointer_type ptr1, 
-test22.cpp: In member function 'void Object1::func12(Data1*)':
-test22.cpp:126:25: warning: Using parameter 'ptr1' without checking for null pointer
-             ptr1->ftest1();
-                         ^
 fill: pointer_type __first, pointer_type __last, 
 _Alloc_hider: 
 __base_dtor : 
diff --git a/test/test22-03.txt b/test/test22-03.txt
index 5f21698..286d0a1 100644
--- a/test/test22-03.txt
+++ b/test/test22-03.txt
@@ -652,87 +652,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __base_ctor : 
 bind_expr : __arg, __fct, 
@@ -741,87 +741,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __comp_ctor : 
 statement_list : __arg, __fct, 
@@ -1896,53 +1896,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -1951,53 +1951,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2035,53 +2035,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -2105,53 +2105,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2372,86 +2372,86 @@ cleanup_point_expr : ptr0,
 expr_stmt : ptr0, 
 convert_expr : ptr0, 
 init_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-parm_decl ptr0: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_point_expr : ptr0, 
-expr_stmt : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_ctor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_stmt : ptr0, 
-statement_list : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_dtor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+parm_decl ptr0: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_point_expr : ptr0, this->ptrval, 
+expr_stmt : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_ctor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_stmt : ptr0, this->ptrval, 
+statement_list : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_dtor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
 block : ptr0, 
 function_decl __base_ctor : 
 bind_expr : ptr0, 
@@ -2460,86 +2460,86 @@ cleanup_point_expr : ptr0,
 expr_stmt : ptr0, 
 convert_expr : ptr0, 
 init_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-parm_decl ptr0: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_point_expr : ptr0, 
-expr_stmt : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_ctor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-try_catch_expr : ptr0, 
-statement_list : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_dtor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+parm_decl ptr0: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_point_expr : ptr0, this->ptrval, 
+expr_stmt : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_ctor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+try_catch_expr : ptr0, this->ptrval, 
+statement_list : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_dtor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
 block : ptr0, 
 function_decl __comp_ctor : 
 statement_list : ptr0, 
@@ -2635,7 +2635,7 @@ var_decl ptr2: ptr1,
 integer_cst 64: ptr1, 
 pointer_plus_expr : ptr1, 
 test22.cpp: In member function 'int Object1::func2(Data1*)':
-test22.cpp:47:28: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:45:28: warning: Using parameter 'ptr1' without checking for null pointer
          Data1* ptr2 = ptr1 + 1;
                             ^
 parm_decl ptr1: ptr1, 
@@ -2687,7 +2687,7 @@ var_decl ptr2: ptr1,
 integer_cst 64: , ptr1, 
 addr_expr : , ptr1, 
 test22.cpp: In member function 'int Object1::func3(Data1*)':
-test22.cpp:52:17: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:50:17: warning: Using parameter 'ptr1' without checking for null pointer
          Data1** ptr2 = &ptr1;
                  ^
 parm_decl ptr1: , ptr1, 
@@ -2727,7 +2727,7 @@ call_expr : ptr1,
 addr_expr : ptr1, 
 function_decl ftest1: ptr1, 
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:58:25: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:56:25: warning: Using parameter 'ptr1' without checking for null pointer
          if (ptr1->ftest1() == 100)
                          ^
 parm_decl ptr1: ptr1, 
@@ -3222,73 +3222,6 @@ integer_cst 64: ptr1, ptr2,
 type_decl Data1: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl ptr2: ptr1, ptr2, 
-function_decl func12: 
-statement_list : ptr1, 
-cleanup_point_expr : ptr1, 
-expr_stmt : ptr1, 
-convert_expr : ptr1, 
-modify_expr : ptr1, 
-component_ref : ptr1, this->dataptr, 
-indirect_ref : ptr1, this->dataptr, 
-parm_decl this: ptr1, this->dataptr, 
-pointer_type : ptr1, this->dataptr, 
-record_type : ptr1, this->dataptr, 
-type_decl Object1: ptr1, this->dataptr, 
-field_decl dataptr: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-type_decl Object1: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-field_decl dataptr: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-parm_decl ptr1: ptr1, this->dataptr, 
-pointer_type : ptr1, this->dataptr, 
-record_type : ptr1, this->dataptr, 
-type_decl Data1: ptr1, this->dataptr, 
-field_decl val: ptr1, this->dataptr, 
-integer_cst 32: ptr1, this->dataptr, 
-field_decl ptrval: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-field_decl arr: ptr1, this->dataptr, 
-integer_cst 96: ptr1, this->dataptr, 
-field_decl str1: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-type_decl Data1: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-if_stmt : ptr1, this->dataptr, 
-ne_expr : ptr1, this->dataptr, 
-component_ref : ptr1, this->dataptr, 
-indirect_ref : ptr1, this->dataptr, 
-parm_decl this: ptr1, this->dataptr, 
-pointer_type : ptr1, this->dataptr, 
-record_type : ptr1, this->dataptr, 
-type_decl Object1: ptr1, this->dataptr, 
-field_decl dataptr: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-type_decl Object1: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-field_decl dataptr: ptr1, this->dataptr, 
-integer_cst 64: ptr1, this->dataptr, 
-integer_cst 0: ptr1, this->dataptr, 
-cleanup_point_expr : 
-expr_stmt : 
-convert_expr : 
-call_expr : 
-addr_expr : 
-function_decl ftest1: 
-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: 
-field_decl str1: 
-integer_cst 64: 
-type_decl Data1: 
-integer_cst 64: 
 function_decl fill: 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
@@ -3766,7 +3699,6 @@ call_expr : __p,
 addr_expr : __p, 
 function_decl operator new: __p, 
 integer_cst 8: __p, 
-non_lvalue_expr : __p, 
 var_decl : __p, 
 cond_expr : __p, 
 ne_expr : __p, 
@@ -3797,7 +3729,6 @@ call_expr : __p,
 addr_expr : __p, 
 function_decl operator delete: __p, 
 var_decl : __p, 
-non_lvalue_expr : __p, 
 var_decl : __p, 
 var_decl : __p, 
 var_decl : __p, 
diff --git a/test/test22-04.txt b/test/test22-04.txt
index 1488a52..4304dae 100644
--- a/test/test22-04.txt
+++ b/test/test22-04.txt
@@ -1,12 +1,12 @@
 test22.cpp: In member function 'int Object1::func2(Data1*)':
-test22.cpp:47:28: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:45:28: warning: Using parameter 'ptr1' without checking for null pointer
          Data1* ptr2 = ptr1 + 1;
                             ^
 test22.cpp: In member function 'int Object1::func3(Data1*)':
-test22.cpp:52:17: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:50:17: warning: Using parameter 'ptr1' without checking for null pointer
          Data1** ptr2 = &ptr1;
                  ^
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:58:25: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:56:25: warning: Using parameter 'ptr1' without checking for null pointer
          if (ptr1->ftest1() == 100)
                          ^
diff --git a/test/test22-05.txt b/test/test22-05.txt
index 1488a52..4304dae 100644
--- a/test/test22-05.txt
+++ b/test/test22-05.txt
@@ -1,12 +1,12 @@
 test22.cpp: In member function 'int Object1::func2(Data1*)':
-test22.cpp:47:28: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:45:28: warning: Using parameter 'ptr1' without checking for null pointer
          Data1* ptr2 = ptr1 + 1;
                             ^
 test22.cpp: In member function 'int Object1::func3(Data1*)':
-test22.cpp:52:17: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:50:17: warning: Using parameter 'ptr1' without checking for null pointer
          Data1** ptr2 = &ptr1;
                  ^
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:58:25: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:56:25: warning: Using parameter 'ptr1' without checking for null pointer
          if (ptr1->ftest1() == 100)
                          ^
diff --git a/test/test23-01.txt b/test/test23-01.txt
index b2b5883..fdbc435 100644
--- a/test/test23-01.txt
+++ b/test/test23-01.txt
@@ -23022,7 +23022,7 @@ function_decl ftest2 test23.cpp 27:16
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl func1 test23.cpp 39:10
+function_decl Object1 test23.cpp 39:5
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23069,13 +23069,13 @@ function_decl func1 test23.cpp 39:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 40:5 - function result
+ result_decl test23.cpp 39:26 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 39:33 - argument
+ parm_decl this test23.cpp 39:24 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23088,7 +23088,526 @@ function_decl func1 test23.cpp 39:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 39:29 - argument
+ parm_decl ptr1 test23.cpp 39:20 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 6:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 17:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 18:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 19:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 20:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 7:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test23.cpp 47:5 - code
+  statement_list - operand
+   cleanup_point_expr test23.cpp 40:21 - statement
+    expr_stmt test23.cpp 40:21 - operand
+     convert_expr - expresssion
+      init_expr - operand
+       component_ref test23.cpp 40:21 - operand
+        indirect_ref - object
+         nop_expr - ref
+          - isUsed: 1
+          parm_decl this test23.cpp 39:24 - operand
+          - isAutogenerated: 1
+           pointer_type - decl type
+            record_type - nested type
+             type_decl Object1 test23.cpp 35:7 - type name
+             - isAutogenerated: 1
+             field_decl dataptr test23.cpp 37:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Object1 test23.cpp 36:1 - field
+             - isAutogenerated: 1
+           integer_cst 64 - parm size
+        field_decl dataptr test23.cpp 37:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+       - isUsed: 1
+       parm_decl ptr1 test23.cpp 39:20 - operand
+        pointer_type - decl type
+         record_type - nested type
+          type_decl Data1 test23.cpp 6:8 - type name
+          - isAutogenerated: 1
+          field_decl val test23.cpp 17:9 - field
+          - signed
+           integer_cst 32 - decl size
+          field_decl ptrval test23.cpp 18:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          field_decl arr test23.cpp 19:14 - field
+          - signed
+           integer_cst 96 - decl size
+          field_decl str1 test23.cpp 20:17 - field
+          - signed
+           integer_cst 64 - decl size
+          type_decl Data1 test23.cpp 7:1 - field
+          - isAutogenerated: 1
+        integer_cst 64 - parm size
+   if_stmt test23.cpp 42:9 - statement
+    ne_expr - condition
+     component_ref test23.cpp 42:13 - operand
+      indirect_ref - object
+       nop_expr - ref
+        - isUsed: 1
+        parm_decl this test23.cpp 39:24 - operand
+        - isAutogenerated: 1
+         pointer_type - decl type
+          record_type - nested type
+           type_decl Object1 test23.cpp 35:7 - type name
+           - isAutogenerated: 1
+           field_decl dataptr test23.cpp 37:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Object1 test23.cpp 36:1 - field
+           - isAutogenerated: 1
+         integer_cst 64 - parm size
+      field_decl dataptr test23.cpp 37:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+     integer_cst 0 - operand
+    cleanup_point_expr test23.cpp 44:27 - then
+     expr_stmt test23.cpp 44:27 - operand
+      convert_expr - expresssion
+       call_expr test23.cpp 44:25 - operand
+        addr_expr - function
+         function_decl ftest1 test23.cpp 22:9 - operand
+         - isExternal: 1
+         - isPublic: 1
+          method_type - function type
+        non_lvalue_expr - arg
+         - isUsed: 1
+         parm_decl ptr1 test23.cpp 39:20 - operand
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data1 test23.cpp 6:8 - type name
+            - isAutogenerated: 1
+            field_decl val test23.cpp 17:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test23.cpp 18:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test23.cpp 19:14 - field
+            - signed
+             integer_cst 96 - decl size
+            field_decl str1 test23.cpp 20:17 - field
+            - signed
+             integer_cst 64 - decl size
+            type_decl Data1 test23.cpp 7:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+   cleanup_point_expr test23.cpp 46:26 - statement
+    expr_stmt test23.cpp 46:26 - operand
+     convert_expr - expresssion
+      call_expr test23.cpp 46:24 - operand
+       addr_expr - function
+        function_decl ftest1 test23.cpp 22:9 - operand
+        - isExternal: 1
+        - isPublic: 1
+         method_type - function type
+       non_lvalue_expr - arg
+        component_ref test23.cpp 46:9 - operand
+         indirect_ref - object
+          nop_expr - ref
+           - isUsed: 1
+           parm_decl this test23.cpp 39:24 - operand
+           - isAutogenerated: 1
+            pointer_type - decl type
+             record_type - nested type
+              type_decl Object1 test23.cpp 35:7 - type name
+              - isAutogenerated: 1
+              field_decl dataptr test23.cpp 37:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Object1 test23.cpp 36:1 - field
+              - isAutogenerated: 1
+            integer_cst 64 - parm size
+         field_decl dataptr test23.cpp 37:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+  block - operand
+function_decl __base_ctor  test23.cpp 39:5
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 35:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 37:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 36:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 35:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 37:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 36:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 6:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 17:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 18:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 19:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 20:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 7:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 47:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test23.cpp 39:24 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 35:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 37:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 36:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 39:20 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 6:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 17:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 18:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 19:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 20:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 7:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test23.cpp 47:5 - code
+  statement_list - operand
+   cleanup_point_expr test23.cpp 40:21 - statement
+    expr_stmt test23.cpp 40:21 - operand
+     convert_expr - expresssion
+      init_expr - operand
+       component_ref test23.cpp 40:21 - operand
+        indirect_ref - object
+         nop_expr - ref
+          - isUsed: 1
+          parm_decl this test23.cpp 39:24 - operand
+          - isAutogenerated: 1
+           pointer_type - decl type
+            record_type - nested type
+             type_decl Object1 test23.cpp 35:7 - type name
+             - isAutogenerated: 1
+             field_decl dataptr test23.cpp 37:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Object1 test23.cpp 36:1 - field
+             - isAutogenerated: 1
+           integer_cst 64 - parm size
+        field_decl dataptr test23.cpp 37:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+       - isUsed: 1
+       parm_decl ptr1 test23.cpp 39:20 - operand
+        pointer_type - decl type
+         record_type - nested type
+          type_decl Data1 test23.cpp 6:8 - type name
+          - isAutogenerated: 1
+          field_decl val test23.cpp 17:9 - field
+          - signed
+           integer_cst 32 - decl size
+          field_decl ptrval test23.cpp 18:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          field_decl arr test23.cpp 19:14 - field
+          - signed
+           integer_cst 96 - decl size
+          field_decl str1 test23.cpp 20:17 - field
+          - signed
+           integer_cst 64 - decl size
+          type_decl Data1 test23.cpp 7:1 - field
+          - isAutogenerated: 1
+        integer_cst 64 - parm size
+   cond_expr test23.cpp 42:9 - statement
+    ne_expr - operand
+     component_ref test23.cpp 42:13 - operand
+      indirect_ref - object
+       nop_expr - ref
+        - isUsed: 1
+        parm_decl this test23.cpp 39:24 - operand
+        - isAutogenerated: 1
+         pointer_type - decl type
+          record_type - nested type
+           type_decl Object1 test23.cpp 35:7 - type name
+           - isAutogenerated: 1
+           field_decl dataptr test23.cpp 37:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Object1 test23.cpp 36:1 - field
+           - isAutogenerated: 1
+         integer_cst 64 - parm size
+      field_decl dataptr test23.cpp 37:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+     integer_cst 0 - operand
+    cleanup_point_expr test23.cpp 44:27 - operand
+     expr_stmt test23.cpp 44:27 - operand
+      convert_expr - expresssion
+       call_expr test23.cpp 44:25 - operand
+        addr_expr - function
+         function_decl ftest1 test23.cpp 22:9 - operand
+         - isExternal: 1
+         - isPublic: 1
+          method_type - function type
+        non_lvalue_expr - arg
+         - isUsed: 1
+         parm_decl ptr1 test23.cpp 39:20 - operand
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data1 test23.cpp 6:8 - type name
+            - isAutogenerated: 1
+            field_decl val test23.cpp 17:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test23.cpp 18:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            field_decl arr test23.cpp 19:14 - field
+            - signed
+             integer_cst 96 - decl size
+            field_decl str1 test23.cpp 20:17 - field
+            - signed
+             integer_cst 64 - decl size
+            type_decl Data1 test23.cpp 7:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+    nop_expr test23.cpp 42:9 - operand
+     integer_cst 0 - operand
+   cleanup_point_expr test23.cpp 46:26 - statement
+    expr_stmt test23.cpp 46:26 - operand
+     convert_expr - expresssion
+      call_expr test23.cpp 46:24 - operand
+       addr_expr - function
+        function_decl ftest1 test23.cpp 22:9 - operand
+        - isExternal: 1
+        - isPublic: 1
+         method_type - function type
+       non_lvalue_expr - arg
+        component_ref test23.cpp 46:9 - operand
+         indirect_ref - object
+          nop_expr - ref
+           - isUsed: 1
+           parm_decl this test23.cpp 39:24 - operand
+           - isAutogenerated: 1
+            pointer_type - decl type
+             record_type - nested type
+              type_decl Object1 test23.cpp 35:7 - type name
+              - isAutogenerated: 1
+              field_decl dataptr test23.cpp 37:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Object1 test23.cpp 36:1 - field
+              - isAutogenerated: 1
+            integer_cst 64 - parm size
+         field_decl dataptr test23.cpp 37:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+  block - operand
+function_decl __comp_ctor  test23.cpp 39:5
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 35:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 37:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 36:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 35:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 37:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 36:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 6:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 17:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 18:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 19:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 20:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 7:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 47:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test23.cpp 39:24 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 35:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 37:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 36:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 39:20 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test23.cpp 6:8 - type name
+    - isAutogenerated: 1
+    field_decl val test23.cpp 17:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test23.cpp 18:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    field_decl arr test23.cpp 19:14 - field
+    - signed
+     integer_cst 96 - decl size
+    field_decl str1 test23.cpp 20:17 - field
+    - signed
+     integer_cst 64 - decl size
+    type_decl Data1 test23.cpp 7:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl func1 test23.cpp 49:10
+- isPublic: 1
+ method_type - function type
+  void_type - method return type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+  record_type - method base type
+   type_decl Object1 test23.cpp 35:7 - type name
+   - isAutogenerated: 1
+   field_decl dataptr test23.cpp 37:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Object1 test23.cpp 36:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test23.cpp 35:7 - type name
+     - isAutogenerated: 1
+     field_decl dataptr test23.cpp 37:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Object1 test23.cpp 36:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test23.cpp 6:8 - type name
+      - isAutogenerated: 1
+      field_decl val test23.cpp 17:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test23.cpp 18:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      field_decl arr test23.cpp 19:14 - field
+      - signed
+       integer_cst 96 - decl size
+      field_decl str1 test23.cpp 20:17 - field
+      - signed
+       integer_cst 64 - decl size
+      type_decl Data1 test23.cpp 7:1 - field
+      - isAutogenerated: 1
+    tree_list - chain
+     void_type - value
+      type_decl void <built-in> 0:0 - type name
+      - isAutogenerated: 1
+ result_decl test23.cpp 50:5 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ - isUsed: 1
+ parm_decl this test23.cpp 49:33 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test23.cpp 35:7 - type name
+    - isAutogenerated: 1
+    field_decl dataptr test23.cpp 37:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Object1 test23.cpp 36:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test23.cpp 49:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test23.cpp 6:8 - type name
@@ -23109,15 +23628,15 @@ function_decl func1 test23.cpp 39:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 41:23 - statement
-   expr_stmt test23.cpp 41:23 - operand
+  cleanup_point_expr test23.cpp 51:23 - statement
+   expr_stmt test23.cpp 51:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 41:9 - operand
+      component_ref test23.cpp 51:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 39:33 - operand
+         parm_decl this test23.cpp 49:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
@@ -23134,7 +23653,7 @@ function_decl func1 test23.cpp 39:10
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 39:29 - operand
+       parm_decl ptr1 test23.cpp 49:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test23.cpp 6:8 - type name
@@ -23154,13 +23673,13 @@ function_decl func1 test23.cpp 39:10
           type_decl Data1 test23.cpp 7:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 42:9 - statement
+  if_stmt test23.cpp 52:9 - statement
    ne_expr - condition
-    component_ref test23.cpp 42:13 - operand
+    component_ref test23.cpp 52:13 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 39:33 - operand
+       parm_decl this test23.cpp 49:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
@@ -23176,10 +23695,10 @@ function_decl func1 test23.cpp 39:10
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 44:27 - then
-    expr_stmt test23.cpp 44:27 - operand
+   cleanup_point_expr test23.cpp 54:27 - then
+    expr_stmt test23.cpp 54:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 44:25 - operand
+      call_expr test23.cpp 54:25 - operand
        addr_expr - function
         function_decl ftest1 test23.cpp 22:9 - operand
         - isExternal: 1
@@ -23187,7 +23706,7 @@ function_decl func1 test23.cpp 39:10
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 39:29 - operand
+        parm_decl ptr1 test23.cpp 49:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test23.cpp 6:8 - type name
@@ -23207,7 +23726,7 @@ function_decl func1 test23.cpp 39:10
            type_decl Data1 test23.cpp 7:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func2 test23.cpp 48:10
+function_decl func2 test23.cpp 58:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23254,13 +23773,13 @@ function_decl func2 test23.cpp 48:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 49:5 - function result
+ result_decl test23.cpp 59:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 48:33 - argument
+ parm_decl this test23.cpp 58:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23273,7 +23792,7 @@ function_decl func2 test23.cpp 48:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 48:29 - argument
+ parm_decl ptr1 test23.cpp 58:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test23.cpp 6:8 - type name
@@ -23294,15 +23813,15 @@ function_decl func2 test23.cpp 48:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 50:23 - statement
-   expr_stmt test23.cpp 50:23 - operand
+  cleanup_point_expr test23.cpp 60:23 - statement
+   expr_stmt test23.cpp 60:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 50:9 - operand
+      component_ref test23.cpp 60:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 48:33 - operand
+         parm_decl this test23.cpp 58:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
@@ -23319,7 +23838,7 @@ function_decl func2 test23.cpp 48:10
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 48:29 - operand
+       parm_decl ptr1 test23.cpp 58:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test23.cpp 6:8 - type name
@@ -23339,11 +23858,11 @@ function_decl func2 test23.cpp 48:10
           type_decl Data1 test23.cpp 7:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 51:9 - statement
+  if_stmt test23.cpp 61:9 - statement
    ne_expr - condition
     nop_expr - operand
      - isUsed: 1
-     parm_decl ptr1 test23.cpp 48:29 - operand
+     parm_decl ptr1 test23.cpp 58:29 - operand
       pointer_type - decl type
        record_type - nested type
         type_decl Data1 test23.cpp 6:8 - type name
@@ -23364,10 +23883,10 @@ function_decl func2 test23.cpp 48:10
         - isAutogenerated: 1
       integer_cst 64 - parm size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 53:27 - then
-    expr_stmt test23.cpp 53:27 - operand
+   cleanup_point_expr test23.cpp 63:27 - then
+    expr_stmt test23.cpp 63:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 53:25 - operand
+      call_expr test23.cpp 63:25 - operand
        addr_expr - function
         function_decl ftest1 test23.cpp 22:9 - operand
         - isExternal: 1
@@ -23375,7 +23894,7 @@ function_decl func2 test23.cpp 48:10
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 48:29 - operand
+        parm_decl ptr1 test23.cpp 58:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test23.cpp 6:8 - type name
@@ -23395,7 +23914,7 @@ function_decl func2 test23.cpp 48:10
            type_decl Data1 test23.cpp 7:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func3 test23.cpp 57:10
+function_decl func3 test23.cpp 67:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23442,13 +23961,13 @@ function_decl func3 test23.cpp 57:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 58:5 - function result
+ result_decl test23.cpp 68:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 57:33 - argument
+ parm_decl this test23.cpp 67:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23461,7 +23980,7 @@ function_decl func3 test23.cpp 57:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 57:29 - argument
+ parm_decl ptr1 test23.cpp 67:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test23.cpp 6:8 - type name
@@ -23482,15 +24001,15 @@ function_decl func3 test23.cpp 57:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 59:23 - statement
-   expr_stmt test23.cpp 59:23 - operand
+  cleanup_point_expr test23.cpp 69:23 - statement
+   expr_stmt test23.cpp 69:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 59:9 - operand
+      component_ref test23.cpp 69:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 57:33 - operand
+         parm_decl this test23.cpp 67:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
@@ -23507,7 +24026,7 @@ function_decl func3 test23.cpp 57:10
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 57:29 - operand
+       parm_decl ptr1 test23.cpp 67:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test23.cpp 6:8 - type name
@@ -23527,13 +24046,13 @@ function_decl func3 test23.cpp 57:10
           type_decl Data1 test23.cpp 7:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 60:9 - statement
-   eq_expr test23.cpp 60:14 - condition
-    component_ref test23.cpp 60:14 - operand
+  if_stmt test23.cpp 70:9 - statement
+   eq_expr test23.cpp 70:14 - condition
+    component_ref test23.cpp 70:14 - operand
      indirect_ref - object
       nop_expr - ref
        - isUsed: 1
-       parm_decl this test23.cpp 57:33 - operand
+       parm_decl this test23.cpp 67:33 - operand
        - isAutogenerated: 1
         pointer_type - decl type
          record_type - nested type
@@ -23549,10 +24068,10 @@ function_decl func3 test23.cpp 57:10
      - unsigned
       integer_cst 64 - decl size
     integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 62:27 - then
-    expr_stmt test23.cpp 62:27 - operand
+   cleanup_point_expr test23.cpp 72:27 - then
+    expr_stmt test23.cpp 72:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 62:25 - operand
+      call_expr test23.cpp 72:25 - operand
        addr_expr - function
         function_decl ftest1 test23.cpp 22:9 - operand
         - isExternal: 1
@@ -23560,7 +24079,7 @@ function_decl func3 test23.cpp 57:10
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 57:29 - operand
+        parm_decl ptr1 test23.cpp 67:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test23.cpp 6:8 - type name
@@ -23580,7 +24099,7 @@ function_decl func3 test23.cpp 57:10
            type_decl Data1 test23.cpp 7:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func4 test23.cpp 66:10
+function_decl func4 test23.cpp 76:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23627,13 +24146,13 @@ function_decl func4 test23.cpp 66:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 67:5 - function result
+ result_decl test23.cpp 77:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 66:33 - argument
+ parm_decl this test23.cpp 76:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23646,7 +24165,7 @@ function_decl func4 test23.cpp 66:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 66:29 - argument
+ parm_decl ptr1 test23.cpp 76:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test23.cpp 6:8 - type name
@@ -23667,15 +24186,15 @@ function_decl func4 test23.cpp 66:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 68:23 - statement
-   expr_stmt test23.cpp 68:23 - operand
+  cleanup_point_expr test23.cpp 78:23 - statement
+   expr_stmt test23.cpp 78:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 68:9 - operand
+      component_ref test23.cpp 78:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 66:33 - operand
+         parm_decl this test23.cpp 76:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
@@ -23692,7 +24211,7 @@ function_decl func4 test23.cpp 66:10
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 66:29 - operand
+       parm_decl ptr1 test23.cpp 76:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test23.cpp 6:8 - type name
@@ -23712,14 +24231,14 @@ function_decl func4 test23.cpp 66:10
           type_decl Data1 test23.cpp 7:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 69:9 - statement
-   truth_andif_expr test23.cpp 69:22 - condition
-    eq_expr test23.cpp 69:14 - operand
-     component_ref test23.cpp 69:14 - operand
+  if_stmt test23.cpp 79:9 - statement
+   truth_andif_expr test23.cpp 79:22 - condition
+    eq_expr test23.cpp 79:14 - operand
+     component_ref test23.cpp 79:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 66:33 - operand
+        parm_decl this test23.cpp 76:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
@@ -23738,7 +24257,7 @@ function_decl func4 test23.cpp 66:10
     ne_expr - operand
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 66:29 - operand
+      parm_decl ptr1 test23.cpp 76:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test23.cpp 6:8 - type name
@@ -23759,10 +24278,10 @@ function_decl func4 test23.cpp 66:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 71:27 - then
-    expr_stmt test23.cpp 71:27 - operand
+   cleanup_point_expr test23.cpp 81:27 - then
+    expr_stmt test23.cpp 81:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 71:25 - operand
+      call_expr test23.cpp 81:25 - operand
        addr_expr - function
         function_decl ftest1 test23.cpp 22:9 - operand
         - isExternal: 1
@@ -23770,7 +24289,7 @@ function_decl func4 test23.cpp 66:10
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 66:29 - operand
+        parm_decl ptr1 test23.cpp 76:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test23.cpp 6:8 - type name
@@ -23790,7 +24309,7 @@ function_decl func4 test23.cpp 66:10
            type_decl Data1 test23.cpp 7:1 - field
            - isAutogenerated: 1
          integer_cst 64 - parm size
-function_decl func5 test23.cpp 75:10
+function_decl func5 test23.cpp 85:10
 - isPublic: 1
  method_type - function type
   void_type - method return type
@@ -23837,13 +24356,13 @@ function_decl func5 test23.cpp 75:10
      void_type - value
       type_decl void <built-in> 0:0 - type name
       - isAutogenerated: 1
- result_decl test23.cpp 76:5 - function result
+ result_decl test23.cpp 86:5 - function result
  - isAutogenerated: 1
   void_type - result type
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  - isUsed: 1
- parm_decl this test23.cpp 75:33 - argument
+ parm_decl this test23.cpp 85:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
@@ -23856,7 +24375,7 @@ function_decl func5 test23.cpp 75:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test23.cpp 75:29 - argument
+ parm_decl ptr1 test23.cpp 85:29 - argument
   pointer_type - decl type
    record_type - nested type
     type_decl Data1 test23.cpp 6:8 - type name
@@ -23877,15 +24396,15 @@ function_decl func5 test23.cpp 75:10
     - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
-  cleanup_point_expr test23.cpp 77:23 - statement
-   expr_stmt test23.cpp 77:23 - operand
+  cleanup_point_expr test23.cpp 87:23 - statement
+   expr_stmt test23.cpp 87:23 - operand
     convert_expr - expresssion
      modify_expr - operand
-      component_ref test23.cpp 77:9 - operand
+      component_ref test23.cpp 87:9 - operand
        indirect_ref - object
         nop_expr - ref
          - isUsed: 1
-         parm_decl this test23.cpp 75:33 - operand
+         parm_decl this test23.cpp 85:33 - operand
          - isAutogenerated: 1
           pointer_type - decl type
            record_type - nested type
@@ -23902,7 +24421,7 @@ function_decl func5 test23.cpp 75:10
         integer_cst 64 - decl size
       nop_expr - operand
        - isUsed: 1
-       parm_decl ptr1 test23.cpp 75:29 - operand
+       parm_decl ptr1 test23.cpp 85:29 - operand
         pointer_type - decl type
          record_type - nested type
           type_decl Data1 test23.cpp 6:8 - type name
@@ -23922,14 +24441,14 @@ function_decl func5 test23.cpp 75:10
           type_decl Data1 test23.cpp 7:1 - field
           - isAutogenerated: 1
         integer_cst 64 - parm size
-  if_stmt test23.cpp 78:9 - statement
-   truth_orif_expr test23.cpp 78:22 - condition
-    eq_expr test23.cpp 78:14 - operand
-     component_ref test23.cpp 78:14 - operand
+  if_stmt test23.cpp 88:9 - statement
+   truth_orif_expr test23.cpp 88:22 - condition
+    eq_expr test23.cpp 88:14 - operand
+     component_ref test23.cpp 88:14 - operand
       indirect_ref - object
        nop_expr - ref
         - isUsed: 1
-        parm_decl this test23.cpp 75:33 - operand
+        parm_decl this test23.cpp 85:33 - operand
         - isAutogenerated: 1
          pointer_type - decl type
           record_type - nested type
@@ -23945,10 +24464,10 @@ function_decl func5 test23.cpp 75:10
       - unsigned
        integer_cst 64 - decl size
      integer_cst 0 - operand
-    eq_expr test23.cpp 78:26 - operand
+    eq_expr test23.cpp 88:26 - operand
      nop_expr - operand
       - isUsed: 1
-      parm_decl ptr1 test23.cpp 75:29 - operand
+      parm_decl ptr1 test23.cpp 85:29 - operand
        pointer_type - decl type
         record_type - nested type
          type_decl Data1 test23.cpp 6:8 - type name
@@ -23969,10 +24488,10 @@ function_decl func5 test23.cpp 75:10
          - isAutogenerated: 1
        integer_cst 64 - parm size
      integer_cst 0 - operand
-   cleanup_point_expr test23.cpp 80:27 - then
-    expr_stmt test23.cpp 80:27 - operand
+   cleanup_point_expr test23.cpp 90:27 - then
+    expr_stmt test23.cpp 90:27 - operand
      convert_expr - expresssion
-      call_expr test23.cpp 80:25 - operand
+      call_expr test23.cpp 90:25 - operand
        addr_expr - function
         function_decl ftest1 test23.cpp 22:9 - operand
         - isExternal: 1
@@ -23980,7 +24499,7 @@ function_decl func5 test23.cpp 75:10
          method_type - function type
        nop_expr - arg
         - isUsed: 1
-        parm_decl ptr1 test23.cpp 75:29 - operand
+        parm_decl ptr1 test23.cpp 85:29 - operand
          pointer_type - decl type
           record_type - nested type
            type_decl Data1 test23.cpp 6:8 - type name
diff --git a/test/test23-02.txt b/test/test23-02.txt
index 3b65f3e..62fead7 100644
--- a/test/test23-02.txt
+++ b/test/test23-02.txt
@@ -218,29 +218,38 @@ __base_ctor : pointer_type ptr0,
 __comp_ctor : pointer_type ptr0, 
 ftest1: 
 ftest2: pointer_type ptr0, 
+Object1: pointer_type ptr1, 
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:44: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:44: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:44:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:54: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:53:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:63:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func3: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:62:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func4: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func4(Data1*)':
-test23.cpp:71:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:81:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 func5: pointer_type ptr1, 
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 fill: pointer_type __first, pointer_type __last, 
diff --git a/test/test23-03.txt b/test/test23-03.txt
index 72847ad..d3db60a 100644
--- a/test/test23-03.txt
+++ b/test/test23-03.txt
@@ -652,87 +652,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __base_ctor : 
 bind_expr : __arg, __fct, 
@@ -741,87 +741,87 @@ cleanup_point_expr : __arg, __fct,
 expr_stmt : __arg, __fct, 
 convert_expr : __arg, __fct, 
 init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __fct: __arg, __fct, 
-pointer_type : __arg, __fct, 
-function_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-tree_list : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-parm_decl __arg: __arg, __fct, 
-pointer_type : __arg, __fct, 
-void_type : __arg, __fct, 
-type_decl void: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-cleanup_point_expr : __arg, __fct, 
-expr_stmt : __arg, __fct, 
-convert_expr : __arg, __fct, 
-init_expr : __arg, __fct, 
-component_ref : __arg, __fct, 
-indirect_ref : __arg, __fct, 
-parm_decl this: __arg, __fct, 
-pointer_type : __arg, __fct, 
-record_type : __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-field_decl __cancel_routine: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __cancel_arg: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-field_decl __cancel_type: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-type_decl __pthread_cleanup_class: __arg, __fct, 
-integer_cst 64: __arg, __fct, 
-field_decl __do_it: __arg, __fct, 
-integer_cst 32: __arg, __fct, 
-integer_cst 1: __arg, __fct, 
+component_ref : __arg, __fct, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+parm_decl __fct: __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+function_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+tree_list : __arg, __fct, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl __arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+void_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl void: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+cleanup_point_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+expr_stmt : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+convert_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+init_expr : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+component_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+indirect_ref : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+parm_decl this: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+pointer_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+record_type : __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_routine: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_arg: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __cancel_type: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+type_decl __pthread_cleanup_class: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 64: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+field_decl __do_it: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 32: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
+integer_cst 1: __arg, __fct, this->__cancel_arg, this->__cancel_routine, 
 block : __arg, __fct, 
 function_decl __comp_ctor : 
 statement_list : __arg, __fct, 
@@ -1896,53 +1896,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -1951,53 +1951,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_reference: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-type_decl _Bit_reference: __x, 
-integer_cst 64: __x, 
-field_decl _M_mask: __x, 
-integer_cst 64: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_mask: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_mask, this->_M_p, 
+indirect_ref : __x, this->_M_mask, this->_M_p, 
+parm_decl this: __x, this->_M_mask, this->_M_p, 
+pointer_type : __x, this->_M_mask, this->_M_p, 
+record_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+field_decl _M_p: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_reference: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+field_decl _M_mask: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+parm_decl __y: __x, this->_M_mask, this->_M_p, 
+integer_type : __x, this->_M_mask, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
+integer_cst 0: __x, this->_M_mask, this->_M_p, 
+integer_cst : __x, this->_M_mask, this->_M_p, 
+integer_cst 64: __x, this->_M_mask, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2035,53 +2035,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __base_ctor : 
 bind_expr : __x, 
@@ -2105,53 +2105,53 @@ cleanup_point_expr : __x,
 expr_stmt : __x, 
 convert_expr : __x, 
 init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-parm_decl __x: __x, 
-pointer_type : __x, 
-integer_type : __x, 
-type_decl _Bit_type: __x, 
-integer_cst 64: __x, 
-integer_cst 0: __x, 
-integer_cst : __x, 
-integer_cst 64: __x, 
-cleanup_point_expr : __x, 
-expr_stmt : __x, 
-convert_expr : __x, 
-init_expr : __x, 
-component_ref : __x, 
-indirect_ref : __x, 
-parm_decl this: __x, 
-pointer_type : __x, 
-record_type : __x, 
-type_decl _Bit_iterator_base: __x, 
-field_decl _M_p: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-type_decl _Bit_iterator_base: __x, 
-integer_cst 64: __x, 
-field_decl _M_offset: __x, 
-integer_cst 32: __x, 
-parm_decl __y: __x, 
-integer_type : __x, 
-type_decl unsigned int: __x, 
-integer_cst 32: __x, 
-integer_cst 0: __x, 
-integer_cst 4294967295: __x, 
-integer_cst 32: __x, 
+component_ref : __x, this->_M_p, 
+indirect_ref : __x, this->_M_p, 
+parm_decl this: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+record_type : __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_offset: __x, this->_M_p, 
+integer_cst 32: __x, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+field_decl _M_p: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+parm_decl __x: __x, this->_M_p, 
+pointer_type : __x, this->_M_p, 
+integer_type : __x, this->_M_p, 
+type_decl _Bit_type: __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+integer_cst 0: __x, this->_M_p, 
+integer_cst : __x, this->_M_p, 
+integer_cst 64: __x, this->_M_p, 
+cleanup_point_expr : __x, this->_M_p, 
+expr_stmt : __x, this->_M_p, 
+convert_expr : __x, this->_M_p, 
+init_expr : __x, this->_M_p, 
+component_ref : __x, this->_M_offset, this->_M_p, 
+indirect_ref : __x, this->_M_offset, this->_M_p, 
+parm_decl this: __x, this->_M_offset, this->_M_p, 
+pointer_type : __x, this->_M_offset, this->_M_p, 
+record_type : __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+field_decl _M_p: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+type_decl _Bit_iterator_base: __x, this->_M_offset, this->_M_p, 
+integer_cst 64: __x, this->_M_offset, this->_M_p, 
+field_decl _M_offset: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+parm_decl __y: __x, this->_M_offset, this->_M_p, 
+integer_type : __x, this->_M_offset, this->_M_p, 
+type_decl unsigned int: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
+integer_cst 0: __x, this->_M_offset, this->_M_p, 
+integer_cst 4294967295: __x, this->_M_offset, this->_M_p, 
+integer_cst 32: __x, this->_M_offset, this->_M_p, 
 block : __x, 
 function_decl __comp_ctor : 
 statement_list : __x, 
@@ -2372,86 +2372,86 @@ cleanup_point_expr : ptr0,
 expr_stmt : ptr0, 
 convert_expr : ptr0, 
 init_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-parm_decl ptr0: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_point_expr : ptr0, 
-expr_stmt : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_ctor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_stmt : ptr0, 
-statement_list : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_dtor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+parm_decl ptr0: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_point_expr : ptr0, this->ptrval, 
+expr_stmt : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_ctor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_stmt : ptr0, this->ptrval, 
+statement_list : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_dtor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
 block : ptr0, 
 function_decl __base_ctor : 
 bind_expr : ptr0, 
@@ -2460,86 +2460,86 @@ cleanup_point_expr : ptr0,
 expr_stmt : ptr0, 
 convert_expr : ptr0, 
 init_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-parm_decl ptr0: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-cleanup_point_expr : ptr0, 
-expr_stmt : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_ctor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-try_catch_expr : ptr0, 
-statement_list : ptr0, 
-call_expr : ptr0, 
-addr_expr : ptr0, 
-function_decl __comp_dtor : ptr0, 
-addr_expr : ptr0, 
-component_ref : ptr0, 
-indirect_ref : ptr0, 
-parm_decl this: ptr0, 
-pointer_type : ptr0, 
-record_type : ptr0, 
-type_decl Data1: ptr0, 
-field_decl val: ptr0, 
-integer_cst 32: ptr0, 
-field_decl ptrval: ptr0, 
-integer_cst 64: ptr0, 
-field_decl arr: ptr0, 
-integer_cst 96: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
-type_decl Data1: ptr0, 
-integer_cst 64: ptr0, 
-field_decl str1: ptr0, 
-integer_cst 64: ptr0, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+parm_decl ptr0: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+cleanup_point_expr : ptr0, this->ptrval, 
+expr_stmt : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_ctor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+try_catch_expr : ptr0, this->ptrval, 
+statement_list : ptr0, this->ptrval, 
+call_expr : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+function_decl __comp_dtor : ptr0, this->ptrval, 
+addr_expr : ptr0, this->ptrval, 
+component_ref : ptr0, this->ptrval, 
+indirect_ref : ptr0, this->ptrval, 
+parm_decl this: ptr0, this->ptrval, 
+pointer_type : ptr0, this->ptrval, 
+record_type : ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+field_decl val: ptr0, this->ptrval, 
+integer_cst 32: ptr0, this->ptrval, 
+field_decl ptrval: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl arr: ptr0, this->ptrval, 
+integer_cst 96: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+type_decl Data1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
+field_decl str1: ptr0, this->ptrval, 
+integer_cst 64: ptr0, this->ptrval, 
 block : ptr0, 
 function_decl __comp_ctor : 
 statement_list : ptr0, 
@@ -2555,6 +2555,189 @@ integer_cst -2147483648: ptr0,
 integer_cst 2147483647: ptr0, 
 integer_cst 32: ptr0, 
 integer_cst 1: ptr0, 
+function_decl Object1: 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+init_expr : ptr1, 
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+parm_decl ptr1: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Data1: ptr1, this->dataptr, 
+field_decl val: ptr1, this->dataptr, 
+integer_cst 32: ptr1, this->dataptr, 
+field_decl ptrval: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl arr: ptr1, this->dataptr, 
+integer_cst 96: ptr1, this->dataptr, 
+field_decl str1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Data1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+if_stmt : ptr1, this->dataptr, 
+ne_expr : ptr1, this->dataptr, 
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+integer_cst 0: ptr1, this->dataptr, 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+call_expr : 
+addr_expr : 
+function_decl ftest1: 
+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: 
+field_decl str1: 
+integer_cst 64: 
+type_decl Data1: 
+integer_cst 64: 
+cleanup_point_expr : ptr1, this->dataptr, 
+expr_stmt : ptr1, this->dataptr, 
+convert_expr : ptr1, this->dataptr, 
+call_expr : ptr1, this->dataptr, 
+addr_expr : ptr1, this->dataptr, 
+function_decl ftest1: ptr1, this->dataptr, 
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+         dataptr->ftest1();
+                        ^
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+block : ptr1, 
+function_decl __base_ctor : 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+init_expr : ptr1, 
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+parm_decl ptr1: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Data1: ptr1, this->dataptr, 
+field_decl val: ptr1, this->dataptr, 
+integer_cst 32: ptr1, this->dataptr, 
+field_decl ptrval: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl arr: ptr1, this->dataptr, 
+integer_cst 96: ptr1, this->dataptr, 
+field_decl str1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Data1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+cond_expr : ptr1, this->dataptr, 
+ne_expr : ptr1, this->dataptr, 
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+integer_cst 0: ptr1, this->dataptr, 
+cleanup_point_expr : 
+expr_stmt : 
+convert_expr : 
+call_expr : 
+addr_expr : 
+function_decl ftest1: 
+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: 
+field_decl str1: 
+integer_cst 64: 
+type_decl Data1: 
+integer_cst 64: 
+integer_cst 0: ptr1, this->dataptr, 
+cleanup_point_expr : ptr1, this->dataptr, 
+expr_stmt : ptr1, this->dataptr, 
+convert_expr : ptr1, this->dataptr, 
+call_expr : ptr1, this->dataptr, 
+addr_expr : ptr1, this->dataptr, 
+function_decl ftest1: ptr1, this->dataptr, 
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+component_ref : ptr1, this->dataptr, 
+indirect_ref : ptr1, this->dataptr, 
+parm_decl this: ptr1, this->dataptr, 
+pointer_type : ptr1, this->dataptr, 
+record_type : ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+type_decl Object1: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+field_decl dataptr: ptr1, this->dataptr, 
+integer_cst 64: ptr1, this->dataptr, 
+block : ptr1, 
+function_decl __comp_ctor : 
+statement_list : ptr1, 
 function_decl func1: 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
@@ -2745,7 +2928,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:62:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
@@ -2917,7 +3100,7 @@ call_expr : ptr1, this->dataptr,
 addr_expr : ptr1, this->dataptr, 
 function_decl ftest1: ptr1, this->dataptr, 
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 parm_decl ptr1: ptr1, this->dataptr, 
diff --git a/test/test23-04.txt b/test/test23-04.txt
index 4a24c7e..bfd3985 100644
--- a/test/test23-04.txt
+++ b/test/test23-04.txt
@@ -1,8 +1,14 @@
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+         dataptr->ftest1();
+                        ^
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:62:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
diff --git a/test/test23-05.txt b/test/test23-05.txt
index 4a24c7e..bfd3985 100644
--- a/test/test23-05.txt
+++ b/test/test23-05.txt
@@ -1,8 +1,14 @@
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
+         dataptr->ftest1();
+                        ^
+test23.cpp: In constructor 'Object1::Object1(Data1*)':
+test23.cpp:46:24: warning: Using field 'this->dataptr' without checking for null pointer
 test23.cpp: In member function 'void Object1::func3(Data1*)':
-test23.cpp:62:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:72:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
 test23.cpp: In member function 'void Object1::func5(Data1*)':
-test23.cpp:80:25: warning: Using parameter 'ptr1' without checking for null pointer
+test23.cpp:90:25: warning: Using parameter 'ptr1' without checking for null pointer
              ptr1->ftest1();
                          ^
diff --git a/test/test23.cpp b/test/test23.cpp
index 89dff5c..6b9771e 100644
--- a/test/test23.cpp
+++ b/test/test23.cpp
@@ -36,6 +36,16 @@ class Object1
 {
     Data1 *dataptr;
 
+    Object1(Data1 *ptr1) :
+        dataptr(ptr1)
+    {
+        if (dataptr)
+        {
+            ptr1->ftest1();
+        }
+        dataptr->ftest1();
+    }
+
     void func1(Data1 *const ptr1)
     {
         dataptr = ptr1;