summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/test07-05.txt218
-rw-r--r--test/test21-03.txt168
-rw-r--r--test/test22-03.txt218
-rw-r--r--test/test23-03.txt218
-rw-r--r--test/test25-01.txt240
-rw-r--r--test/test25-02.txt3
-rw-r--r--test/test25-03.txt51
-rw-r--r--test/test25-04.txt2
-rw-r--r--test/test25-05.txt4
-rw-r--r--test/test25.cpp8
10 files changed, 685 insertions, 445 deletions
diff --git a/test/test07-05.txt b/test/test07-05.txt
index 0ea769e..a97bf0d 100644
--- a/test/test07-05.txt
+++ b/test/test07-05.txt
@@ -2290,31 +2290,31 @@ cleanup_point_expr :
expr_stmt :
convert_expr :
modify_expr :
-component_ref : this->__do_it,
-indirect_ref : this->__do_it,
-parm_decl this: this->__do_it,
-pointer_type : this->__do_it,
-record_type : this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-field_decl __cancel_routine: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __cancel_arg: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-field_decl __cancel_type: this->__do_it,
-integer_cst 32: this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-parm_decl __newval: this->__do_it,
-integer_type : this->__do_it,
-type_decl int: this->__do_it,
-integer_cst 32: this->__do_it,
-integer_cst -2147483648: this->__do_it,
-integer_cst 2147483647: this->__do_it,
-integer_cst 32: this->__do_it,
+component_ref :
+indirect_ref :
+parm_decl this:
+pointer_type :
+record_type :
+type_decl __pthread_cleanup_class:
+field_decl __cancel_routine:
+integer_cst 64:
+field_decl __cancel_arg:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+field_decl __cancel_type:
+integer_cst 32:
+type_decl __pthread_cleanup_class:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+parm_decl __newval:
+integer_type :
+type_decl int:
+integer_cst 32:
+integer_cst -2147483648:
+integer_cst 2147483647:
+integer_cst 32:
function_decl __defer:
cleanup_point_expr :
expr_stmt :
@@ -3776,27 +3776,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -3831,27 +3831,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
@@ -4336,27 +4336,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -4407,27 +4407,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
diff --git a/test/test21-03.txt b/test/test21-03.txt
index d60d363..ecaba87 100644
--- a/test/test21-03.txt
+++ b/test/test21-03.txt
@@ -953,27 +953,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -1008,27 +1008,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
@@ -1513,27 +1513,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -1584,27 +1584,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
diff --git a/test/test22-03.txt b/test/test22-03.txt
index 2b8fa3c..c7e7d04 100644
--- a/test/test22-03.txt
+++ b/test/test22-03.txt
@@ -2290,31 +2290,31 @@ cleanup_point_expr :
expr_stmt :
convert_expr :
modify_expr :
-component_ref : this->__do_it,
-indirect_ref : this->__do_it,
-parm_decl this: this->__do_it,
-pointer_type : this->__do_it,
-record_type : this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-field_decl __cancel_routine: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __cancel_arg: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-field_decl __cancel_type: this->__do_it,
-integer_cst 32: this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-parm_decl __newval: this->__do_it,
-integer_type : this->__do_it,
-type_decl int: this->__do_it,
-integer_cst 32: this->__do_it,
-integer_cst -2147483648: this->__do_it,
-integer_cst 2147483647: this->__do_it,
-integer_cst 32: this->__do_it,
+component_ref :
+indirect_ref :
+parm_decl this:
+pointer_type :
+record_type :
+type_decl __pthread_cleanup_class:
+field_decl __cancel_routine:
+integer_cst 64:
+field_decl __cancel_arg:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+field_decl __cancel_type:
+integer_cst 32:
+type_decl __pthread_cleanup_class:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+parm_decl __newval:
+integer_type :
+type_decl int:
+integer_cst 32:
+integer_cst -2147483648:
+integer_cst 2147483647:
+integer_cst 32:
function_decl __defer:
cleanup_point_expr :
expr_stmt :
@@ -3776,27 +3776,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -3831,27 +3831,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
@@ -4336,27 +4336,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -4407,27 +4407,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
diff --git a/test/test23-03.txt b/test/test23-03.txt
index ec137b7..82986ef 100644
--- a/test/test23-03.txt
+++ b/test/test23-03.txt
@@ -2290,31 +2290,31 @@ cleanup_point_expr :
expr_stmt :
convert_expr :
modify_expr :
-component_ref : this->__do_it,
-indirect_ref : this->__do_it,
-parm_decl this: this->__do_it,
-pointer_type : this->__do_it,
-record_type : this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-field_decl __cancel_routine: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __cancel_arg: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-field_decl __cancel_type: this->__do_it,
-integer_cst 32: this->__do_it,
-type_decl __pthread_cleanup_class: this->__do_it,
-integer_cst 64: this->__do_it,
-field_decl __do_it: this->__do_it,
-integer_cst 32: this->__do_it,
-parm_decl __newval: this->__do_it,
-integer_type : this->__do_it,
-type_decl int: this->__do_it,
-integer_cst 32: this->__do_it,
-integer_cst -2147483648: this->__do_it,
-integer_cst 2147483647: this->__do_it,
-integer_cst 32: this->__do_it,
+component_ref :
+indirect_ref :
+parm_decl this:
+pointer_type :
+record_type :
+type_decl __pthread_cleanup_class:
+field_decl __cancel_routine:
+integer_cst 64:
+field_decl __cancel_arg:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+field_decl __cancel_type:
+integer_cst 32:
+type_decl __pthread_cleanup_class:
+integer_cst 64:
+field_decl __do_it:
+integer_cst 32:
+parm_decl __newval:
+integer_type :
+type_decl int:
+integer_cst 32:
+integer_cst -2147483648:
+integer_cst 2147483647:
+integer_cst 32:
function_decl __defer:
cleanup_point_expr :
expr_stmt :
@@ -3776,27 +3776,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -3831,27 +3831,27 @@ 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,
+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_mask: __x, this->_M_p,
+integer_cst 64: __x, this->_M_p,
+parm_decl __y: __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,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
@@ -4336,27 +4336,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __base_ctor :
bind_expr : __x,
@@ -4407,27 +4407,27 @@ 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,
+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_offset: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+parm_decl __y: __x, this->_M_p,
+integer_type : __x, this->_M_p,
+type_decl unsigned int: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
+integer_cst 0: __x, this->_M_p,
+integer_cst 4294967295: __x, this->_M_p,
+integer_cst 32: __x, this->_M_p,
block : __x,
function_decl __comp_ctor :
statement_list : __x,
diff --git a/test/test25-01.txt b/test/test25-01.txt
index f55a51e..d4fa9a6 100644
--- a/test/test25-01.txt
+++ b/test/test25-01.txt
@@ -743,7 +743,7 @@ function_decl ftest2 test25.cpp 23:16
integer_cst 2147483647 - max value
integer_cst 32 - decl size
integer_cst 1 - operand
-function_decl test1 test25.cpp 33:9
+function_decl test1 test25.cpp 35:9
- isPublic: 1
method_type - function type
tree_list - attribute
@@ -761,6 +761,9 @@ function_decl test1 test25.cpp 33:9
record_type - method base type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - arg types
@@ -768,6 +771,9 @@ function_decl test1 test25.cpp 33:9
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - chain
@@ -790,7 +796,7 @@ function_decl test1 test25.cpp 33:9
void_type - value
type_decl void <built-in> 0:0 - type name
- isAutogenerated: 1
- result_decl test25.cpp 34:5 - function result
+ result_decl test25.cpp 36:5 - function result
- isAutogenerated: 1
integer_type - result type
- precisionBits: 32
@@ -801,17 +807,20 @@ function_decl test1 test25.cpp 33:9
integer_cst -2147483648 - min value
integer_cst 2147483647 - max value
integer_cst 32 - decl size
- parm_decl this test25.cpp 33:61 - argument
+ parm_decl this test25.cpp 35:61 - argument
- isAutogenerated: 1
pointer_type - decl type
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- isUsed: 1
- parm_decl ptr1 test25.cpp 33:28 - argument
+ parm_decl ptr1 test25.cpp 35:28 - argument
pointer_type - decl type
record_type - nested type
type_decl Data1 test25.cpp 3:8 - type name
@@ -828,11 +837,11 @@ function_decl test1 test25.cpp 33:9
type_decl Data1 test25.cpp 4:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- if_stmt test25.cpp 35:9 - code
+ if_stmt test25.cpp 37:9 - code
ne_expr - condition
nop_expr - operand
- isUsed: 1
- parm_decl ptr1 test25.cpp 33:28 - operand
+ parm_decl ptr1 test25.cpp 35:28 - operand
pointer_type - decl type
record_type - nested type
type_decl Data1 test25.cpp 3:8 - type name
@@ -850,9 +859,9 @@ function_decl test1 test25.cpp 33:9
- isAutogenerated: 1
integer_cst 64 - parm size
integer_cst 0 - operand
- return_expr test25.cpp 36:20 - then
+ return_expr test25.cpp 38:20 - then
init_expr - operand
- result_decl test25.cpp 34:5 - operand
+ result_decl test25.cpp 36:5 - operand
- isAutogenerated: 1
integer_type - result type
- precisionBits: 32
@@ -864,9 +873,9 @@ function_decl test1 test25.cpp 33:9
integer_cst 2147483647 - max value
integer_cst 32 - decl size
integer_cst 1 - operand
- return_expr test25.cpp 38:20 - else
+ return_expr test25.cpp 40:20 - else
init_expr - operand
- result_decl test25.cpp 34:5 - operand
+ result_decl test25.cpp 36:5 - operand
- isAutogenerated: 1
integer_type - result type
- precisionBits: 32
@@ -878,7 +887,7 @@ function_decl test1 test25.cpp 33:9
integer_cst 2147483647 - max value
integer_cst 32 - decl size
integer_cst 0 - operand
-function_decl func1 test25.cpp 41:10
+function_decl func1 test25.cpp 43:10
- isPublic: 1
method_type - function type
void_type - method return type
@@ -887,6 +896,9 @@ function_decl func1 test25.cpp 41:10
record_type - method base type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - arg types
@@ -894,6 +906,9 @@ function_decl func1 test25.cpp 41:10
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - chain
@@ -916,21 +931,24 @@ function_decl func1 test25.cpp 41:10
void_type - value
type_decl void <built-in> 0:0 - type name
- isAutogenerated: 1
- result_decl test25.cpp 42:5 - function result
+ result_decl test25.cpp 44:5 - function result
- isAutogenerated: 1
void_type - result type
type_decl void <built-in> 0:0 - type name
- isAutogenerated: 1
- parm_decl this test25.cpp 41:33 - argument
+ parm_decl this test25.cpp 43:33 - argument
- isAutogenerated: 1
pointer_type - decl type
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- parm_decl ptr1 test25.cpp 41:29 - argument
+ parm_decl ptr1 test25.cpp 43:29 - argument
pointer_type - decl type
record_type - nested type
type_decl Data1 test25.cpp 3:8 - type name
@@ -947,12 +965,12 @@ function_decl func1 test25.cpp 41:10
type_decl Data1 test25.cpp 4:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- cleanup_point_expr test25.cpp 43:23 - code
- expr_stmt test25.cpp 43:23 - operand
+ cleanup_point_expr test25.cpp 45:23 - code
+ expr_stmt test25.cpp 45:23 - operand
convert_expr - expresssion
- call_expr test25.cpp 43:14 - operand
+ call_expr test25.cpp 45:14 - operand
addr_expr - function
- function_decl test1 test25.cpp 33:9 - operand
+ function_decl test1 test25.cpp 35:9 - operand
- isExternal: 1
- isPublic: 1
method_type - function type
@@ -960,17 +978,20 @@ function_decl func1 test25.cpp 41:10
identifier_node nonnull - purpose
tree_list - value
integer_cst 2 - value
- parm_decl this test25.cpp 41:33 - arg
+ parm_decl this test25.cpp 43:33 - arg
- isAutogenerated: 1
pointer_type - decl type
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
integer_cst 0 - arg
-function_decl func2 test25.cpp 46:10
+function_decl func2 test25.cpp 48:10
- isPublic: 1
method_type - function type
void_type - method return type
@@ -979,6 +1000,9 @@ function_decl func2 test25.cpp 46:10
record_type - method base type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - arg types
@@ -986,6 +1010,9 @@ function_decl func2 test25.cpp 46:10
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
tree_list - chain
@@ -1008,22 +1035,25 @@ function_decl func2 test25.cpp 46:10
void_type - value
type_decl void <built-in> 0:0 - type name
- isAutogenerated: 1
- result_decl test25.cpp 47:5 - function result
+ result_decl test25.cpp 49:5 - function result
- isAutogenerated: 1
void_type - result type
type_decl void <built-in> 0:0 - type name
- isAutogenerated: 1
- parm_decl this test25.cpp 46:33 - argument
+ parm_decl this test25.cpp 48:33 - argument
- isAutogenerated: 1
pointer_type - decl type
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- isUsed: 1
- parm_decl ptr1 test25.cpp 46:29 - argument
+ parm_decl ptr1 test25.cpp 48:29 - argument
pointer_type - decl type
record_type - nested type
type_decl Data1 test25.cpp 3:8 - type name
@@ -1040,12 +1070,12 @@ function_decl func2 test25.cpp 46:10
type_decl Data1 test25.cpp 4:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
- cleanup_point_expr test25.cpp 48:20 - code
- expr_stmt test25.cpp 48:20 - operand
+ cleanup_point_expr test25.cpp 50:20 - code
+ expr_stmt test25.cpp 50:20 - operand
convert_expr - expresssion
- call_expr test25.cpp 48:14 - operand
+ call_expr test25.cpp 50:14 - operand
addr_expr - function
- function_decl test1 test25.cpp 33:9 - operand
+ function_decl test1 test25.cpp 35:9 - operand
- isExternal: 1
- isPublic: 1
method_type - function type
@@ -1053,18 +1083,21 @@ function_decl func2 test25.cpp 46:10
identifier_node nonnull - purpose
tree_list - value
integer_cst 2 - value
- parm_decl this test25.cpp 46:33 - arg
+ parm_decl this test25.cpp 48:33 - arg
- isAutogenerated: 1
pointer_type - decl type
record_type - nested type
type_decl Object1 test25.cpp 31:7 - type name
- isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
type_decl Object1 test25.cpp 32:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
nop_expr - arg
- isUsed: 1
- parm_decl ptr1 test25.cpp 46:29 - operand
+ parm_decl ptr1 test25.cpp 48:29 - operand
pointer_type - decl type
record_type - nested type
type_decl Data1 test25.cpp 3:8 - type name
@@ -1081,3 +1114,152 @@ function_decl func2 test25.cpp 46:10
type_decl Data1 test25.cpp 4:1 - field
- isAutogenerated: 1
integer_cst 64 - parm size
+function_decl func3 test25.cpp 53: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 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ tree_list - arg types
+ pointer_type - value
+ record_type - nested type
+ type_decl Object1 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ tree_list - chain
+ pointer_type - value
+ record_type - nested type
+ type_decl Data1 test25.cpp 3:8 - type name
+ - isAutogenerated: 1
+ field_decl val test25.cpp 14:9 - field
+ - signed
+ integer_cst 32 - decl size
+ field_decl ptrval test25.cpp 15:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ field_decl arr test25.cpp 16:14 - field
+ - signed
+ integer_cst 96 - decl size
+ type_decl Data1 test25.cpp 4:1 - field
+ - isAutogenerated: 1
+ tree_list - chain
+ void_type - value
+ type_decl void <built-in> 0:0 - type name
+ - isAutogenerated: 1
+ result_decl test25.cpp 54: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 test25.cpp 53:33 - argument
+ - isAutogenerated: 1
+ pointer_type - decl type
+ record_type - nested type
+ type_decl Object1 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ integer_cst 64 - parm size
+ parm_decl ptr1 test25.cpp 53:29 - argument
+ pointer_type - decl type
+ record_type - nested type
+ type_decl Data1 test25.cpp 3:8 - type name
+ - isAutogenerated: 1
+ field_decl val test25.cpp 14:9 - field
+ - signed
+ integer_cst 32 - decl size
+ field_decl ptrval test25.cpp 15:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ field_decl arr test25.cpp 16:14 - field
+ - signed
+ integer_cst 96 - decl size
+ type_decl Data1 test25.cpp 4:1 - field
+ - isAutogenerated: 1
+ integer_cst 64 - parm size
+ statement_list - code
+ cleanup_point_expr test25.cpp 55:45 - statement
+ expr_stmt test25.cpp 55:45 - operand
+ convert_expr - expresssion
+ modify_expr - operand
+ component_ref test25.cpp 55:9 - operand
+ indirect_ref - object
+ nop_expr - ref
+ - isUsed: 1
+ parm_decl this test25.cpp 53:33 - operand
+ - isAutogenerated: 1
+ pointer_type - decl type
+ record_type - nested type
+ type_decl Object1 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ integer_cst 64 - parm size
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ integer_cst 1 - operand
+ cleanup_point_expr test25.cpp 56:22 - statement
+ expr_stmt test25.cpp 56:22 - operand
+ convert_expr - expresssion
+ call_expr test25.cpp 56:14 - operand
+ addr_expr - function
+ function_decl test1 test25.cpp 35:9 - operand
+ - isExternal: 1
+ - isPublic: 1
+ method_type - function type
+ tree_list - attribute
+ identifier_node nonnull - purpose
+ tree_list - value
+ integer_cst 2 - value
+ - isUsed: 1
+ parm_decl this test25.cpp 53:33 - arg
+ - isAutogenerated: 1
+ pointer_type - decl type
+ record_type - nested type
+ type_decl Object1 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ integer_cst 64 - parm size
+ component_ref test25.cpp 56:15 - arg
+ indirect_ref - object
+ nop_expr - ref
+ - isUsed: 1
+ parm_decl this test25.cpp 53:33 - operand
+ - isAutogenerated: 1
+ pointer_type - decl type
+ record_type - nested type
+ type_decl Object1 test25.cpp 31:7 - type name
+ - isAutogenerated: 1
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
+ type_decl Object1 test25.cpp 32:1 - field
+ - isAutogenerated: 1
+ integer_cst 64 - parm size
+ field_decl ptrval test25.cpp 33:12 - field
+ - unsigned
+ integer_cst 64 - decl size
diff --git a/test/test25-02.txt b/test/test25-02.txt
index 4594505..5a1bb16 100644
--- a/test/test25-02.txt
+++ b/test/test25-02.txt
@@ -10,6 +10,7 @@ test1:
func1: pointer_type ptr1,
func2: pointer_type ptr1,
test25.cpp: In member function 'void Object1::func2(Data1*)':
-test25.cpp:48:14: warning: warning: possible null argument 'ptr1' where non-null required
+test25.cpp:50:14: warning: warning: possible null argument 'ptr1' where non-null required
test1(ptr1);
^
+func3: pointer_type ptr1,
diff --git a/test/test25-03.txt b/test/test25-03.txt
index 9a8a457..6b04a13 100644
--- a/test/test25-03.txt
+++ b/test/test25-03.txt
@@ -149,6 +149,8 @@ parm_decl this: ptr1,
pointer_type : ptr1,
record_type : ptr1,
type_decl Object1: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
type_decl Object1: ptr1,
integer_cst 64: ptr1,
integer_cst 0: ptr1,
@@ -163,10 +165,12 @@ parm_decl this: ptr1,
pointer_type : ptr1,
record_type : ptr1,
type_decl Object1: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
type_decl Object1: ptr1,
integer_cst 64: ptr1,
test25.cpp: In member function 'void Object1::func2(Data1*)':
-test25.cpp:48:14: warning: warning: possible null argument 'ptr1' where non-null required
+test25.cpp:50:14: warning: warning: possible null argument 'ptr1' where non-null required
test1(ptr1);
^
parm_decl ptr1: ptr1,
@@ -181,3 +185,48 @@ field_decl arr: ptr1,
integer_cst 96: ptr1,
type_decl Data1: ptr1,
integer_cst 64: ptr1,
+function_decl func3:
+statement_list : ptr1,
+cleanup_point_expr : ptr1,
+expr_stmt : ptr1,
+convert_expr : ptr1,
+modify_expr : ptr1,
+component_ref : ptr1,
+indirect_ref : ptr1,
+parm_decl this: ptr1,
+pointer_type : ptr1,
+record_type : ptr1,
+type_decl Object1: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
+type_decl Object1: ptr1,
+integer_cst 64: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
+integer_cst 1: ptr1,
+cleanup_point_expr : ptr1,
+expr_stmt : ptr1,
+convert_expr : ptr1,
+call_expr : ptr1,
+addr_expr : ptr1,
+function_decl test1: ptr1,
+parm_decl this: ptr1,
+pointer_type : ptr1,
+record_type : ptr1,
+type_decl Object1: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
+type_decl Object1: ptr1,
+integer_cst 64: ptr1,
+component_ref : ptr1,
+indirect_ref : ptr1,
+parm_decl this: ptr1,
+pointer_type : ptr1,
+record_type : ptr1,
+type_decl Object1: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
+type_decl Object1: ptr1,
+integer_cst 64: ptr1,
+field_decl ptrval: ptr1,
+integer_cst 64: ptr1,
diff --git a/test/test25-04.txt b/test/test25-04.txt
index 07e291e..0b6869b 100644
--- a/test/test25-04.txt
+++ b/test/test25-04.txt
@@ -1,4 +1,4 @@
test25.cpp: In member function 'void Object1::func2(Data1*)':
-test25.cpp:48:14: warning: warning: possible null argument 'ptr1' where non-null required
+test25.cpp:50:14: warning: warning: possible null argument 'ptr1' where non-null required
test1(ptr1);
^
diff --git a/test/test25-05.txt b/test/test25-05.txt
index 83c663a..228415f 100644
--- a/test/test25-05.txt
+++ b/test/test25-05.txt
@@ -1,8 +1,8 @@
test25.cpp: In member function 'void Object1::func1(Data1*)':
-test25.cpp:43:22: warning: null argument where non-null required (argument 2) [-Wnonnull]
+test25.cpp:45:22: warning: null argument where non-null required (argument 2) [-Wnonnull]
test1(nullptr);
^
test25.cpp: In member function 'void Object1::func2(Data1*)':
-test25.cpp:48:14: warning: warning: possible null argument 'ptr1' where non-null required
+test25.cpp:50:14: warning: warning: possible null argument 'ptr1' where non-null required
test1(ptr1);
^
diff --git a/test/test25.cpp b/test/test25.cpp
index 58db4ea..d50ec91 100644
--- a/test/test25.cpp
+++ b/test/test25.cpp
@@ -30,6 +30,8 @@ int k;
class Object1
{
+ Data1 *ptrval;
+
int test1(Data1 *const ptr1) __attribute__((nonnull (2)))
{
if (ptr1)
@@ -47,4 +49,10 @@ class Object1
{
test1(ptr1);
}
+
+ void func3(Data1 *const ptr1)
+ {
+ ptrval = reinterpret_cast<Data1*>(1);
+ test1(ptrval);
+ }
};