Update test 22. Update test results.

17 files changed, 4417 insertions, 2026 deletions

diff --git a/test/test05-05.txt b/test/test05-05.txt
index e483f28..33991d6 100644
--- a/test/test05-05.txt
+++ b/test/test05-05.txt
@@ -61,14 +61,6 @@ integer_cst 8: b,
 integer_cst 300: b, 
 function_decl func5: 
 bind_expr : b, 
-var_decl var1: b, 
-integer_cst 32: b, 
-integer_cst 1: b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
 statement_list : b, 
 cleanup_point_expr : b, 
 decl_expr : b, 
@@ -95,21 +87,20 @@ mult_expr : b,
 var_decl var1: b, 
 integer_cst 4: b, 
 integer_cst 400: b, 
+var_decl var1: b, 
+integer_cst 32: b, 
+integer_cst 1: b, 
+integer_type : b, 
+type_decl int: b, 
+integer_cst 32: b, 
+integer_cst -2147483648: b, 
+integer_cst 2147483647: b, 
 block : b, 
 var_decl var1: b, 
 function_decl func6: 
 bind_expr : b, 
-var_decl var2: b, var2, 
-integer_cst 64: b, var2, 
-parm_decl b: b, var2, 
-pointer_type : b, var2, 
-integer_type : b, var2, 
-type_decl int: b, var2, 
-integer_cst 32: b, var2, 
-integer_cst -2147483648: b, var2, 
-integer_cst 2147483647: b, var2, 
-statement_list : b, var2, 
-decl_expr : b, var2, 
+statement_list : b, 
+decl_expr : b, 
 var_decl var2: b, var2, 
 cleanup_point_expr : b, var2, 
 expr_stmt : b, var2, 
@@ -122,10 +113,29 @@ test05.cpp:34:16: warning: Using variable 'var2' without checking for null point
 indirect_ref : b, var2, 
 var_decl var2: b, var2, 
 integer_cst 500: b, var2, 
+var_decl var2: b, 
+integer_cst 64: b, var2, 
+parm_decl b: b, var2, 
+pointer_type : b, var2, 
+integer_type : b, var2, 
+type_decl int: b, var2, 
+integer_cst 32: b, var2, 
+integer_cst -2147483648: b, var2, 
+integer_cst 2147483647: b, var2, 
 block : b, var2, 
 var_decl var2: b, var2, 
 function_decl func7: 
 bind_expr : b, 
+statement_list : b, 
+decl_expr : b, 
+var_decl var3: b, 
+cleanup_point_expr : b, 
+expr_stmt : b, 
+convert_expr : b, 
+modify_expr : b, 
+indirect_ref : b, 
+var_decl var3: b, 
+integer_cst 600: b, 
 var_decl var3: b, 
 integer_cst 64: b, 
 pointer_plus_expr : b, 
@@ -148,20 +158,21 @@ type_decl int: b,
 integer_cst 32: b, 
 integer_cst -2147483648: b, 
 integer_cst 2147483647: b, 
-statement_list : b, 
-decl_expr : b, 
-var_decl var3: b, 
-cleanup_point_expr : b, 
-expr_stmt : b, 
-convert_expr : b, 
-modify_expr : b, 
-indirect_ref : b, 
-var_decl var3: b, 
-integer_cst 600: b, 
 block : b, 
 var_decl var3: b, 
 function_decl func8: 
 bind_expr : bptr, 
+statement_list : bptr, 
+decl_expr : bptr, 
+var_decl var4: bptr, 
+cleanup_point_expr : bptr, 
+expr_stmt : bptr, 
+convert_expr : bptr, 
+modify_expr : bptr, 
+indirect_ref : bptr, 
+indirect_ref : bptr, 
+var_decl var4: bptr, 
+integer_cst 700: bptr, 
 var_decl var4: bptr, 
 integer_cst 64: bptr, 
 addr_expr : bptr, 
@@ -184,16 +195,5 @@ type_decl int: bptr,
 integer_cst 32: bptr, 
 integer_cst -2147483648: bptr, 
 integer_cst 2147483647: bptr, 
-statement_list : bptr, 
-decl_expr : bptr, 
-var_decl var4: bptr, 
-cleanup_point_expr : bptr, 
-expr_stmt : bptr, 
-convert_expr : bptr, 
-modify_expr : bptr, 
-indirect_ref : bptr, 
-indirect_ref : bptr, 
-var_decl var4: bptr, 
-integer_cst 700: bptr, 
 block : bptr, 
 var_decl var4: bptr, 
diff --git a/test/test06-04.txt b/test/test06-04.txt
index 91bb4ac..898b718 100644
--- a/test/test06-04.txt
+++ b/test/test06-04.txt
@@ -159,6 +159,11 @@ integer_cst 2147483647: a,
 integer_cst 64: a, 
 integer_cst 0: a, 
 bind_expr : a, 
+statement_list : a, 
+cleanup_point_expr : a, 
+decl_expr : a, 
+var_decl k: a, 
+return_expr : a, 
 var_decl k: a, 
 integer_cst 32: a, 
 integer_cst 10: a, 
@@ -167,14 +172,9 @@ type_decl int: a,
 integer_cst 32: a, 
 integer_cst -2147483648: a, 
 integer_cst 2147483647: a, 
-statement_list : a, 
-cleanup_point_expr : a, 
-decl_expr : a, 
-var_decl k: a, 
-return_expr : a, 
 block : a, 
 var_decl k: a, 
-block : a, 
+block : 
 block : 
 var_decl k: 
 cleanup_point_expr : a, 
@@ -215,6 +215,11 @@ integer_cst 2147483647: aptr,
 integer_cst 64: aptr, 
 integer_cst 0: aptr, 
 bind_expr : aptr, 
+statement_list : aptr, 
+cleanup_point_expr : aptr, 
+decl_expr : aptr, 
+var_decl k: aptr, 
+return_expr : aptr, 
 var_decl k: aptr, 
 integer_cst 32: aptr, 
 integer_cst 10: aptr, 
@@ -223,17 +228,12 @@ type_decl int: aptr,
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-statement_list : aptr, 
-cleanup_point_expr : aptr, 
-decl_expr : aptr, 
-var_decl k: aptr, 
-return_expr : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-block : aptr, 
+block : 
 block : 
 var_decl k: 
-block : aptr, 
+block : 
 block : 
 block : 
 var_decl k: 
@@ -287,14 +287,6 @@ bind_expr : aptr,
 if_stmt : aptr, 
 integer_cst 0: aptr, 
 bind_expr : aptr, 
-var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_cst 10: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
 statement_list : aptr, 
 cleanup_point_expr : aptr, 
 decl_expr : aptr, 
@@ -309,6 +301,14 @@ type_decl int: aptr,
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
+var_decl k: aptr, 
+integer_cst 32: aptr, 
+integer_cst 10: aptr, 
+integer_type : aptr, 
+type_decl int: aptr, 
+integer_cst 32: aptr, 
+integer_cst -2147483648: aptr, 
+integer_cst 2147483647: aptr, 
 block : aptr, 
 var_decl k: aptr, 
 var_decl l: aptr, 
@@ -322,7 +322,7 @@ block : aptr,
 block : aptr, 
 var_decl k: aptr, 
 var_decl l: aptr, 
-block : aptr, 
+block : 
 block : 
 block : 
 block : 
diff --git a/test/test07-05.txt b/test/test07-05.txt
index a7e41a6..d308ba0 100644
--- a/test/test07-05.txt
+++ b/test/test07-05.txt
@@ -489,23 +489,6 @@ eh_spec_block : ,
 statement_list : , 
 function_decl __convert_from_v: 
 bind_expr : __fmt, __out, 
-var_decl __old: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-pointer_type : __fmt, __out, 
-type_decl __c_locale: __fmt, __out, 
-record_type : __fmt, __out, 
-type_decl __locale_struct: __fmt, __out, 
-field_decl __locales: __fmt, __out, 
-integer_cst 832: __fmt, __out, 
-field_decl __ctype_b: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __ctype_tolower: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __ctype_toupper: __fmt, __out, 
-integer_cst 64: __fmt, __out, 
-field_decl __names: __fmt, __out, 
-integer_cst 832: __fmt, __out, 
-type_decl __locale_struct: __fmt, __out, 
 statement_list : __fmt, __out, 
 decl_expr : __fmt, __out, 
 var_decl __old: __fmt, __out, 
@@ -639,6 +622,23 @@ integer_cst -2147483648: __fmt, __out,
 integer_cst 2147483647: __fmt, __out, 
 integer_cst 32: __fmt, __out, 
 var_decl __ret: __fmt, __out, 
+var_decl __old: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+pointer_type : __fmt, __out, 
+type_decl __c_locale: __fmt, __out, 
+record_type : __fmt, __out, 
+type_decl __locale_struct: __fmt, __out, 
+field_decl __locales: __fmt, __out, 
+integer_cst 832: __fmt, __out, 
+field_decl __ctype_b: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __ctype_tolower: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __ctype_toupper: __fmt, __out, 
+integer_cst 64: __fmt, __out, 
+field_decl __names: __fmt, __out, 
+integer_cst 832: __fmt, __out, 
+type_decl __locale_struct: __fmt, __out, 
 block : __fmt, __out, 
 var_decl __old: __fmt, __out, 
 var_decl __args: __fmt, __out, 
@@ -1685,22 +1685,6 @@ integer_cst 32: __mem,
 integer_cst 4: __mem, 
 function_decl __exchange_and_add_single: 
 bind_expr : __mem, 
-var_decl __result: __mem, 
-integer_cst 32: __mem, 
-indirect_ref : __mem, 
-parm_decl __mem: __mem, 
-pointer_type : __mem, 
-integer_type : __mem, 
-type_decl _Atomic_word: __mem, 
-integer_cst 32: __mem, 
-integer_cst -2147483648: __mem, 
-integer_cst 2147483647: __mem, 
-integer_cst 64: __mem, 
-integer_type : __mem, 
-type_decl _Atomic_word: __mem, 
-integer_cst 32: __mem, 
-integer_cst -2147483648: __mem, 
-integer_cst 2147483647: __mem, 
 statement_list : __mem, 
 decl_expr : __mem, 
 var_decl __result: __mem, 
@@ -1744,6 +1728,22 @@ integer_cst -2147483648: __mem,
 integer_cst 2147483647: __mem, 
 integer_cst 32: __mem, 
 var_decl __result: __mem, 
+var_decl __result: __mem, 
+integer_cst 32: __mem, 
+indirect_ref : __mem, 
+parm_decl __mem: __mem, 
+pointer_type : __mem, 
+integer_type : __mem, 
+type_decl _Atomic_word: __mem, 
+integer_cst 32: __mem, 
+integer_cst -2147483648: __mem, 
+integer_cst 2147483647: __mem, 
+integer_cst 64: __mem, 
+integer_type : __mem, 
+type_decl _Atomic_word: __mem, 
+integer_cst 32: __mem, 
+integer_cst -2147483648: __mem, 
+integer_cst 2147483647: __mem, 
 block : __mem, 
 var_decl __result: __mem, 
 function_decl __atomic_add_single: 
@@ -2650,22 +2650,6 @@ integer_cst : __it,
 integer_cst 64: __it, 
 function_decl __fill_a: 
 bind_expr : __first, __last, 
-var_decl __tmp: __first, __last, 
-integer_cst 32: __first, __last, 
-indirect_ref : __first, __last, 
-parm_decl __value: __first, __last, 
-reference_type : __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
-integer_cst 64: __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
 statement_list : __first, __last, 
 decl_expr : __first, __last, 
 var_decl __tmp: __first, __last, 
@@ -2713,6 +2697,22 @@ integer_cst 0: __first, __last,
 integer_cst : __first, __last, 
 integer_cst 64: __first, __last, 
 var_decl __tmp: __first, __last, 
+var_decl __tmp: __first, __last, 
+integer_cst 32: __first, __last, 
+indirect_ref : __first, __last, 
+parm_decl __value: __first, __last, 
+reference_type : __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
+integer_cst 64: __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
 block : __first, __last, 
 var_decl __tmp: __first, __last, 
 function_decl _S_empty_rep: 
@@ -2957,13 +2957,6 @@ integer_cst 64: __first, __last, __result,
 function_decl operator*: 
 function_decl _M_check_len: 
 bind_expr : __s, 
-var_decl __len: __s, 
-integer_cst 64: __s, 
-integer_type : __s, 
-type_decl size_type: __s, 
-integer_cst 64: __s, 
-integer_cst 0: __s, 
-integer_cst : __s, 
 statement_list : __s, 
 if_stmt : __s, 
 cleanup_point_expr : __s, 
@@ -3259,6 +3252,13 @@ type_decl difference_type: __s,
 type_decl allocator_type: __s, 
 integer_cst 64: __s, 
 var_decl __len: __s, 
+var_decl __len: __s, 
+integer_cst 64: __s, 
+integer_type : __s, 
+type_decl size_type: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
 var_decl __len: __s, 
 function_decl begin: 
@@ -3442,7 +3442,6 @@ type_decl Struct1: __first, __last,
 integer_cst 64: __first, __last, 
 function_decl _M_deallocate: 
 bind_expr : __p, 
-type_decl _Tr: __p, 
 if_stmt : __p, 
 ne_expr : __p, 
 parm_decl __p: __p, 
@@ -3499,6 +3498,7 @@ integer_cst 64:
 integer_cst 0: 
 integer_cst : 
 integer_cst 64: 
+type_decl _Tr: __p, 
 block : __p, 
 function_decl __normal_iterator: 
 function_decl __base_ctor : 
@@ -3669,7 +3669,6 @@ type_decl Struct1: __p,
 integer_cst 64: __p, 
 function_decl _Destroy: 
 bind_expr : __first, __last, 
-type_decl _Value_type: __first, __last, 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
 call_expr : __first, __last, 
@@ -3697,6 +3696,7 @@ field_decl num: __first, __last,
 integer_cst 32: __first, __last, 
 type_decl Struct1: __first, __last, 
 integer_cst 64: __first, __last, 
+type_decl _Value_type: __first, __last, 
 block : __first, __last, 
 function_decl deallocate: 
 cleanup_point_expr : __p, 
@@ -3820,7 +3820,6 @@ type_decl Struct1: __it,
 integer_cst 64: __it, 
 function_decl __copy_move_backward_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -3879,6 +3878,7 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl max_size: 
@@ -3947,7 +3947,6 @@ integer_cst : ,
 integer_cst 64: , 
 function_decl uninitialized_copy: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -4006,6 +4005,7 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __assignable: __first, __last, __result, 
 function_decl __destroy: 
@@ -4030,40 +4030,6 @@ type_decl Struct1: __p,
 integer_cst 64: __p, 
 function_decl __copy_move_b: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -4137,6 +4103,40 @@ negate_expr : __first, __last, __result,
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 function_decl max_size: 
@@ -4310,7 +4310,6 @@ type_decl Struct1: __first, __last, __result,
 integer_cst 64: __first, __last, __result, 
 function_decl __copy_move_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueTypeI: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -4369,44 +4368,11 @@ field_decl num: __first, __last, __result,
 integer_cst 32: __first, __last, __result, 
 type_decl Struct1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueTypeI: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl __copy_m: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-field_decl str: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-field_decl num: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Struct1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -4474,5 +4440,39 @@ integer_cst 64: __first, __last, __result,
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+field_decl str: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+field_decl num: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+type_decl Struct1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
diff --git a/test/test09-03.txt b/test/test09-03.txt
index 221e956..0d99ec9 100644
--- a/test/test09-03.txt
+++ b/test/test09-03.txt
@@ -638,6 +638,9 @@ integer_cst 2147483647: ptr2,
 integer_cst 64: ptr2, 
 integer_cst 0: ptr2, 
 bind_expr : ptr1, ptr2, 
+cleanup_point_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
 var_decl k: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 integer_cst 0: ptr1, ptr2, 
@@ -646,9 +649,6 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-cleanup_point_expr : ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl k: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl k: ptr1, ptr2, 
 cleanup_point_expr : 
@@ -734,14 +734,6 @@ integer_cst 2147483647: ptr2,
 integer_cst 64: ptr2, 
 integer_cst 0: ptr2, 
 bind_expr : ptr1, ptr2, 
-var_decl k: ptr1, ptr2, 
-integer_cst 32: ptr1, ptr2, 
-integer_cst 10: 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, 
 statement_list : ptr1, ptr2, 
 cleanup_point_expr : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
@@ -764,6 +756,14 @@ integer_cst -2147483648: ptr1, ptr2,
 integer_cst 2147483647: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, 
 integer_cst 100: ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+integer_cst 32: ptr1, ptr2, 
+integer_cst 10: 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, 
 block : ptr1, ptr2, 
 var_decl k: ptr1, ptr2, 
 block : ptr1, ptr2, 
diff --git a/test/test10-03.txt b/test/test10-03.txt
index e7e1a8b..bdd6e54 100644
--- a/test/test10-03.txt
+++ b/test/test10-03.txt
@@ -188,13 +188,6 @@ integer_cst 64: ptr1, ptr2,
 integer_cst 300: ptr1, ptr2, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -271,17 +264,17 @@ integer_cst -2147483648: ptr2,
 integer_cst 2147483647: ptr2, 
 integer_cst 64: ptr2, 
 integer_cst 300: ptr2, 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: ptr2, 
+integer_type : ptr2, 
+type_decl int: ptr2, 
+integer_cst 32: ptr2, 
+integer_cst -2147483648: ptr2, 
+integer_cst 2147483647: ptr2, 
 block : ptr1, ptr2, 
 var_decl c: ptr2, 
 function_decl func4: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -365,17 +358,17 @@ integer_cst -2147483648:
 integer_cst 2147483647: 
 integer_cst 64: 
 integer_cst 300: 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
 block : ptr1, ptr2, 
 var_decl c: 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -471,6 +464,13 @@ integer_cst -2147483648: ptr1, ptr2,
 integer_cst 2147483647: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, 
 integer_cst 300: ptr1, ptr2, 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: 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, 
 block : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
 function_decl func6: 
diff --git a/test/test12-03.txt b/test/test12-03.txt
index 6ad7a60..d9fc97d 100644
--- a/test/test12-03.txt
+++ b/test/test12-03.txt
@@ -1,5 +1,7 @@
 function_decl func1: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl val1: ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 cond_expr : ptr1, ptr2, 
@@ -46,12 +48,12 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl val1: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 function_decl func2: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl val1: ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 cond_expr : ptr1, ptr2, 
@@ -101,12 +103,12 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl val1: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl val1: ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 cond_expr : ptr1, ptr2, 
@@ -164,8 +166,6 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl val1: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl val1: ptr1, ptr2, 
 function_decl func4: 
@@ -249,6 +249,8 @@ integer_cst 32: ptr1, ptr2,
 integer_cst 300: ptr1, ptr2, 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl tmp: ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 component_ref : ptr1, ptr2, 
@@ -291,12 +293,12 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl tmp: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl tmp: ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 cond_expr : ptr1, ptr2, 
@@ -351,12 +353,12 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl tmp: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
 function_decl func7: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl tmp: ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 cond_expr : ptr1, ptr2, 
@@ -415,7 +417,5 @@ type_decl int: ptr1, ptr2,
 integer_cst 32: ptr1, ptr2, 
 integer_cst -2147483648: ptr1, ptr2, 
 integer_cst 2147483647: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl tmp: ptr1, ptr2, 
 block : ptr1, ptr2, 
 var_decl tmp: ptr1, ptr2, 
diff --git a/test/test13-05.txt b/test/test13-05.txt
index aa8b475..439b25c 100644
--- a/test/test13-05.txt
+++ b/test/test13-05.txt
@@ -58,14 +58,6 @@ integer_cst 300: b,
 block : b, 
 function_decl func5: 
 bind_expr : b, 
-var_decl var1: b, 
-integer_cst 32: b, 
-integer_cst 1: b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
 statement_list : b, 
 decl_expr : b, 
 var_decl var1: b, 
@@ -88,21 +80,20 @@ mult_expr : b,
 var_decl var1: b, 
 integer_cst 4: b, 
 integer_cst 400: b, 
+var_decl var1: b, 
+integer_cst 32: b, 
+integer_cst 1: b, 
+integer_type : b, 
+type_decl int: b, 
+integer_cst 32: b, 
+integer_cst -2147483648: b, 
+integer_cst 2147483647: b, 
 block : b, 
 var_decl var1: b, 
 function_decl func6: 
 bind_expr : b, 
-var_decl var2: b, var2, 
-integer_cst 64: b, var2, 
-parm_decl b: b, var2, 
-pointer_type : b, var2, 
-integer_type : b, var2, 
-type_decl int: b, var2, 
-integer_cst 32: b, var2, 
-integer_cst -2147483648: b, var2, 
-integer_cst 2147483647: b, var2, 
-statement_list : b, var2, 
-decl_expr : b, var2, 
+statement_list : b, 
+decl_expr : b, 
 var_decl var2: b, var2, 
 modify_expr : b, var2, 
 test13.c: In function 'func6':
@@ -112,10 +103,26 @@ test13.c:34:11: warning: Using variable 'var2' without checking for null pointer
 indirect_ref : b, var2, 
 var_decl var2: b, var2, 
 integer_cst 500: b, var2, 
+var_decl var2: b, 
+integer_cst 64: b, var2, 
+parm_decl b: b, var2, 
+pointer_type : b, var2, 
+integer_type : b, var2, 
+type_decl int: b, var2, 
+integer_cst 32: b, var2, 
+integer_cst -2147483648: b, var2, 
+integer_cst 2147483647: b, var2, 
 block : b, var2, 
 var_decl var2: b, var2, 
 function_decl func7: 
 bind_expr : b, 
+statement_list : b, 
+decl_expr : b, 
+var_decl var3: b, 
+modify_expr : b, 
+indirect_ref : b, 
+var_decl var3: b, 
+integer_cst 600: b, 
 var_decl var3: b, 
 integer_cst 64: b, 
 pointer_plus_expr : b, 
@@ -138,17 +145,18 @@ type_decl int: b,
 integer_cst 32: b, 
 integer_cst -2147483648: b, 
 integer_cst 2147483647: b, 
-statement_list : b, 
-decl_expr : b, 
-var_decl var3: b, 
-modify_expr : b, 
-indirect_ref : b, 
-var_decl var3: b, 
-integer_cst 600: b, 
 block : b, 
 var_decl var3: b, 
 function_decl func8: 
 bind_expr : bptr, 
+statement_list : bptr, 
+decl_expr : bptr, 
+var_decl var4: bptr, 
+modify_expr : bptr, 
+indirect_ref : bptr, 
+indirect_ref : bptr, 
+var_decl var4: bptr, 
+integer_cst 700: bptr, 
 var_decl var4: bptr, 
 integer_cst 64: bptr, 
 addr_expr : bptr, 
@@ -171,13 +179,5 @@ type_decl int: bptr,
 integer_cst 32: bptr, 
 integer_cst -2147483648: bptr, 
 integer_cst 2147483647: bptr, 
-statement_list : bptr, 
-decl_expr : bptr, 
-var_decl var4: bptr, 
-modify_expr : bptr, 
-indirect_ref : bptr, 
-indirect_ref : bptr, 
-var_decl var4: bptr, 
-integer_cst 700: bptr, 
 block : bptr, 
 var_decl var4: bptr, 
diff --git a/test/test14-04.txt b/test/test14-04.txt
index 74997b8..9ba2710 100644
--- a/test/test14-04.txt
+++ b/test/test14-04.txt
@@ -41,7 +41,7 @@ integer_cst -2147483648:
 integer_cst 2147483647: 
 integer_cst 64: 
 integer_cst 200: 
-block : a, 
+block : 
 function_decl func3: 
 bind_expr : a, 
 statement_list : a, 
@@ -150,6 +150,10 @@ integer_cst 2147483647: a,
 integer_cst 64: a, 
 integer_cst 0: a, 
 bind_expr : a, 
+statement_list : a, 
+decl_expr : a, 
+var_decl k: a, 
+return_expr : a, 
 var_decl k: a, 
 integer_cst 32: a, 
 integer_cst 10: a, 
@@ -158,10 +162,6 @@ type_decl int: a,
 integer_cst 32: a, 
 integer_cst -2147483648: a, 
 integer_cst 2147483647: a, 
-statement_list : a, 
-decl_expr : a, 
-var_decl k: a, 
-return_expr : a, 
 block : a, 
 var_decl k: a, 
 modify_expr : a, 
@@ -195,6 +195,10 @@ integer_cst 2147483647: aptr,
 integer_cst 64: aptr, 
 integer_cst 0: aptr, 
 bind_expr : aptr, 
+statement_list : aptr, 
+decl_expr : aptr, 
+var_decl k: aptr, 
+return_expr : aptr, 
 var_decl k: aptr, 
 integer_cst 32: aptr, 
 integer_cst 10: aptr, 
@@ -203,10 +207,6 @@ type_decl int: aptr,
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-statement_list : aptr, 
-decl_expr : aptr, 
-var_decl k: aptr, 
-return_expr : aptr, 
 block : aptr, 
 var_decl k: aptr, 
 modify_expr : aptr, 
@@ -245,21 +245,21 @@ statement_list : aptr,
 cond_expr : aptr, 
 integer_cst 0: aptr, 
 bind_expr : aptr, 
+statement_list : aptr, 
+decl_expr : aptr, 
 var_decl k: aptr, 
+decl_expr : aptr, 
+var_decl l: aptr, 
 integer_cst 32: aptr, 
-integer_cst 10: aptr, 
+integer_cst 20: aptr, 
 integer_type : aptr, 
 type_decl int: aptr, 
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-statement_list : aptr, 
-decl_expr : aptr, 
 var_decl k: aptr, 
-decl_expr : aptr, 
-var_decl l: aptr, 
 integer_cst 32: aptr, 
-integer_cst 20: aptr, 
+integer_cst 10: aptr, 
 integer_type : aptr, 
 type_decl int: aptr, 
 integer_cst 32: aptr, 
diff --git a/test/test15-03.txt b/test/test15-03.txt
index 17517b1..a4d74a6 100644
--- a/test/test15-03.txt
+++ b/test/test15-03.txt
@@ -168,13 +168,6 @@ integer_cst 300: ptr1, ptr2,
 block : ptr1, ptr2, 
 function_decl func3: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -237,17 +230,17 @@ integer_cst -2147483648: ptr2,
 integer_cst 2147483647: ptr2, 
 integer_cst 64: ptr2, 
 integer_cst 300: ptr2, 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: ptr2, 
+integer_type : ptr2, 
+type_decl int: ptr2, 
+integer_cst 32: ptr2, 
+integer_cst -2147483648: ptr2, 
+integer_cst 2147483647: ptr2, 
 block : ptr1, ptr2, 
 var_decl c: ptr2, 
 function_decl func4: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -317,17 +310,17 @@ integer_cst -2147483648:
 integer_cst 2147483647: 
 integer_cst 64: 
 integer_cst 300: 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
 block : ptr1, ptr2, 
 var_decl c: 
 function_decl func5: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -406,6 +399,13 @@ integer_cst -2147483648: ptr1, ptr2,
 integer_cst 2147483647: ptr1, ptr2, 
 integer_cst 64: ptr1, ptr2, 
 integer_cst 300: ptr1, ptr2, 
+var_decl c: ptr1, ptr2, 
+integer_cst 32: 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, 
 block : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
 function_decl func6: 
diff --git a/test/test19-03.txt b/test/test19-03.txt
index 87127d7..05b87e0 100644
--- a/test/test19-03.txt
+++ b/test/test19-03.txt
@@ -1,5 +1,7 @@
 function_decl func1: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -9,23 +11,12 @@ type_decl Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 type_decl Data1: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
 block : ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 function_decl func2: 
 bind_expr : ptr1, ptr2, 
-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, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 cleanup_point_expr : ptr1, ptr2, ptr3, 
 expr_stmt : ptr1, ptr2, ptr3, 
@@ -41,11 +32,7 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 100: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func3: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -54,8 +41,12 @@ type_decl Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 type_decl Data1: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+block : ptr1, ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func3: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 if_stmt : ptr1, ptr2, ptr3, 
 ne_expr : ptr1, ptr2, ptr3, 
@@ -71,11 +62,7 @@ var_decl ptr3: ptr1, ptr2,
 field_decl val: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 integer_cst 100: ptr1, ptr2, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func4: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -84,8 +71,12 @@ type_decl Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 type_decl Data1: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+block : ptr1, ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func4: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 if_stmt : ptr1, ptr2, ptr3, 
 ne_expr : ptr1, ptr2, ptr3, 
@@ -140,11 +131,7 @@ integer_cst 64: ptr1, ptr3,
 field_decl val: ptr1, ptr3, 
 integer_cst 32: ptr1, ptr3, 
 integer_cst 200: ptr1, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func5: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -153,96 +140,100 @@ type_decl Data1: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 type_decl Data1: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-if_stmt : ptr1, ptr2, ptr3, 
-truth_orif_expr : ptr1, ptr2, ptr3, 
-eq_expr : 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, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-eq_expr : ptr2, 
-var_decl k: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_type : ptr2, ptr3, 
-type_decl int: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_cst -2147483648: ptr2, ptr3, 
-integer_cst 2147483647: ptr2, ptr3, 
-integer_cst 10: ptr2, ptr3, 
-return_expr : ptr1, ptr2, ptr3, 
-init_expr : ptr1, ptr2, ptr3, 
-result_decl : 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, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
-cleanup_point_expr : ptr1, ptr2, ptr3, 
-expr_stmt : ptr2, ptr3, 
-convert_expr : ptr2, ptr3, 
-modify_expr : ptr2, ptr3, 
-component_ref : ptr2, ptr3, 
-indirect_ref : ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
-field_decl val: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_cst 100: ptr2, ptr3, 
 block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func5: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+if_stmt : ptr1, ptr2, 
+truth_orif_expr : ptr1, ptr2, 
+eq_expr : 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, 
+integer_cst 0: ptr1, ptr2, 
+eq_expr : ptr2, 
+var_decl k: ptr2, 
+integer_cst 32: ptr2, 
+integer_type : ptr2, 
+type_decl int: ptr2, 
+integer_cst 32: ptr2, 
+integer_cst -2147483648: ptr2, 
+integer_cst 2147483647: ptr2, 
+integer_cst 10: 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, 
+decl_expr : ptr1, ptr2, 
+var_decl ptr3: ptr2, 
+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, 
+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, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
-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, 
-statement_list : ptr1, ptr2, ptr3, 
-if_stmt : ptr1, ptr2, ptr3, 
-truth_orif_expr : ptr1, ptr2, ptr3, 
-ne_expr : 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, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-eq_expr : ptr1, ptr2, ptr3, 
-var_decl k: ptr1, ptr2, ptr3, 
-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, 
-integer_cst 10: ptr1, ptr2, ptr3, 
-return_expr : ptr1, ptr2, ptr3, 
-init_expr : ptr1, ptr2, ptr3, 
-result_decl : 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, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+statement_list : ptr1, ptr2, 
+if_stmt : ptr1, ptr2, 
+truth_orif_expr : ptr1, ptr2, 
+ne_expr : 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, 
+integer_cst 0: ptr1, ptr2, 
+eq_expr : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+integer_cst 32: 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 10: 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, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 cleanup_point_expr : ptr1, ptr2, ptr3, 
 expr_stmt : ptr1, ptr2, ptr3, 
@@ -258,17 +249,19 @@ 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, 
 function_decl func7: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -347,18 +340,18 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 200: ptr1, 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, 
 function_decl func8: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -437,6 +430,13 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 200: ptr1, 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, 
diff --git a/test/test20-03.txt b/test/test20-03.txt
index 3ec340d..9ffce5e 100644
--- a/test/test20-03.txt
+++ b/test/test20-03.txt
@@ -1,5 +1,7 @@
 function_decl func1: 
 bind_expr : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 integer_cst 64: ptr1, ptr2, ptr3, 
 parm_decl ptr1: ptr1, ptr2, ptr3, 
@@ -8,22 +10,12 @@ record_type : ptr1, ptr2, ptr3,
 identifier_node Data1: ptr1, ptr2, ptr3, 
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
 block : ptr1, ptr2, ptr3, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 function_decl func2: 
 bind_expr : ptr1, ptr2, 
-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, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
 component_ref : ptr1, ptr2, ptr3, 
@@ -36,11 +28,7 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 100: ptr1, ptr2, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func3: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -48,8 +36,12 @@ record_type : ptr1, ptr2, ptr3,
 identifier_node Data1: ptr1, ptr2, ptr3, 
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+block : ptr1, ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func3: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 cond_expr : ptr1, ptr2, ptr3, 
 ne_expr : ptr1, ptr2, ptr3, 
@@ -62,11 +54,7 @@ var_decl ptr3: ptr1, ptr2,
 field_decl val: ptr1, ptr2, 
 integer_cst 32: ptr1, ptr2, 
 integer_cst 100: ptr1, ptr2, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func4: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -74,8 +62,12 @@ record_type : ptr1, ptr2, ptr3,
 identifier_node Data1: ptr1, ptr2, ptr3, 
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+block : ptr1, ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func4: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 cond_expr : ptr1, ptr2, ptr3, 
 ne_expr : ptr1, ptr2, ptr3, 
@@ -121,11 +113,7 @@ integer_cst 64: ptr1, ptr3,
 field_decl val: ptr1, ptr3, 
 integer_cst 32: ptr1, ptr3, 
 integer_cst 200: ptr1, ptr3, 
-block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr1, ptr2, ptr3, 
-function_decl func5: 
-bind_expr : ptr1, ptr2, 
-var_decl ptr3: 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, 
@@ -133,90 +121,94 @@ record_type : ptr1, ptr2, ptr3,
 identifier_node Data1: ptr1, ptr2, ptr3, 
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
-statement_list : ptr1, ptr2, ptr3, 
-cond_expr : ptr1, ptr2, ptr3, 
-truth_orif_expr : ptr1, ptr2, ptr3, 
-eq_expr : 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, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-eq_expr : ptr2, 
-var_decl k: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_type : ptr2, ptr3, 
-type_decl int: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_cst -2147483648: ptr2, ptr3, 
-integer_cst 2147483647: ptr2, ptr3, 
-integer_cst 10: ptr2, ptr3, 
-return_expr : ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-result_decl : 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, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-component_ref : ptr2, ptr3, 
-indirect_ref : ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
-field_decl val: ptr2, ptr3, 
-integer_cst 32: ptr2, ptr3, 
-integer_cst 100: ptr2, ptr3, 
 block : ptr1, ptr2, ptr3, 
-var_decl ptr3: ptr2, ptr3, 
+var_decl ptr3: ptr1, ptr2, ptr3, 
+function_decl func5: 
+bind_expr : ptr1, ptr2, 
+statement_list : ptr1, ptr2, 
+cond_expr : ptr1, ptr2, 
+truth_orif_expr : ptr1, ptr2, 
+eq_expr : 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, 
+integer_cst 0: ptr1, ptr2, 
+eq_expr : ptr2, 
+var_decl k: ptr2, 
+integer_cst 32: ptr2, 
+integer_type : ptr2, 
+type_decl int: ptr2, 
+integer_cst 32: ptr2, 
+integer_cst -2147483648: ptr2, 
+integer_cst 2147483647: ptr2, 
+integer_cst 10: 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, 
+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, 
+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, 
 function_decl func6: 
 bind_expr : ptr1, ptr2, 
-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, 
-statement_list : ptr1, ptr2, ptr3, 
-cond_expr : ptr1, ptr2, ptr3, 
-truth_orif_expr : ptr1, ptr2, ptr3, 
-ne_expr : 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, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-eq_expr : ptr1, ptr2, ptr3, 
-var_decl k: ptr1, ptr2, ptr3, 
-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, 
-integer_cst 10: ptr1, ptr2, ptr3, 
-return_expr : ptr1, ptr2, ptr3, 
-modify_expr : ptr1, ptr2, ptr3, 
-result_decl : 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, 
-integer_cst 32: ptr1, ptr2, ptr3, 
-integer_cst 0: ptr1, ptr2, ptr3, 
-decl_expr : ptr1, ptr2, ptr3, 
+statement_list : ptr1, ptr2, 
+cond_expr : ptr1, ptr2, 
+truth_orif_expr : ptr1, ptr2, 
+ne_expr : 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, 
+integer_cst 0: ptr1, ptr2, 
+eq_expr : ptr1, ptr2, 
+var_decl k: ptr1, ptr2, 
+integer_cst 32: 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 10: 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, 
+decl_expr : ptr1, ptr2, 
 var_decl ptr3: ptr1, ptr2, ptr3, 
 modify_expr : ptr1, ptr2, ptr3, 
 component_ref : ptr1, ptr2, ptr3, 
@@ -229,17 +221,18 @@ 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, 
 function_decl func7: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -309,18 +302,18 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 200: ptr1, 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, 
 function_decl func8: 
 bind_expr : ptr1, ptr2, 
-var_decl c: ptr1, ptr2, 
-integer_cst 32: 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, 
 statement_list : ptr1, ptr2, 
 decl_expr : ptr1, ptr2, 
 var_decl c: ptr1, ptr2, 
@@ -390,6 +383,13 @@ var_decl ptr3: ptr1, ptr2, ptr3,
 field_decl val: ptr1, ptr2, ptr3, 
 integer_cst 32: ptr1, ptr2, ptr3, 
 integer_cst 200: ptr1, 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, 
diff --git a/test/test21-03.txt b/test/test21-03.txt
index 4869522..11cdbbf 100644
--- a/test/test21-03.txt
+++ b/test/test21-03.txt
@@ -530,14 +530,6 @@ function_decl __fill_bvector:
 function_decl fill: 
 function_decl func1: 
 bind_expr : ptr1, 
-var_decl tmpvar: ptr1, 
-integer_cst 32: ptr1, 
-integer_cst 0: ptr1, 
-integer_type : ptr1, 
-type_decl int: ptr1, 
-integer_cst 32: ptr1, 
-integer_cst -2147483648: ptr1, 
-integer_cst 2147483647: ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
@@ -602,19 +594,19 @@ integer_cst -2147483648: ptr2,
 integer_cst 2147483647: ptr2, 
 integer_cst 32: ptr2, 
 integer_cst 0: ptr2, 
+var_decl tmpvar: ptr1, 
+integer_cst 32: ptr2, 
+integer_cst 0: ptr2, 
+integer_type : ptr2, 
+type_decl int: ptr2, 
+integer_cst 32: ptr2, 
+integer_cst -2147483648: ptr2, 
+integer_cst 2147483647: ptr2, 
 block : ptr1, ptr2, 
 var_decl tmpvar: ptr2, 
 var_decl ptr2: ptr2, 
 function_decl func2: 
 bind_expr : ptr1, 
-var_decl attempts: ptr1, 
-integer_cst 32: ptr1, 
-integer_cst 0: ptr1, 
-integer_type : ptr1, 
-type_decl int: ptr1, 
-integer_cst 32: ptr1, 
-integer_cst -2147483648: ptr1, 
-integer_cst 2147483647: ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
@@ -660,73 +652,72 @@ type_decl int: ptr1,
 integer_cst 32: ptr1, 
 integer_cst -2147483648: ptr1, 
 integer_cst 2147483647: ptr1, 
+var_decl attempts: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst 0: ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
 block : ptr1, 
 var_decl attempts: ptr1, 
 var_decl ptr2: ptr1, 
 var_decl outFilename: ptr1, 
 function_decl func3: 
 bind_expr : ptr1, 
-var_decl ptr2: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-void_type : ptr1, ptr2, 
-type_decl void: ptr1, ptr2, 
-integer_cst 64: 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, 
-statement_list : ptr1, ptr2, 
-if_stmt : ptr1, ptr2, 
-eq_expr : ptr1, ptr2, 
-parm_decl ptr1: ptr1, ptr2, 
-pointer_type : ptr1, ptr2, 
-void_type : ptr1, ptr2, 
-type_decl void: ptr1, ptr2, 
-integer_cst 64: ptr1, ptr2, 
-integer_cst 0: 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 1: ptr1, ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl ptr2: ptr2, 
-decl_expr : ptr1, ptr2, 
-var_decl val: ptr2, 
-integer_cst 32: ptr2, 
-component_ref : ptr2, 
-indirect_ref : ptr2, 
-var_decl ptr2: ptr2, 
-field_decl val: ptr2, 
-integer_cst 32: ptr2, 
-integer_type : ptr2, 
-type_decl int: ptr2, 
-integer_cst 32: ptr2, 
-integer_cst -2147483648: ptr2, 
-integer_cst 2147483647: ptr2, 
-block : ptr1, ptr2, 
-var_decl ptr2: ptr2, 
-var_decl val: ptr2, 
-function_decl func4: 
-bind_expr : ptr1, 
-var_decl ptr2: ptr1, 
+statement_list : ptr1, 
+if_stmt : ptr1, 
+eq_expr : ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+void_type : ptr1, 
+type_decl void: ptr1, 
 integer_cst 64: ptr1, 
 integer_cst 0: ptr1, 
-pointer_type : ptr1, 
-record_type : ptr1, 
-type_decl Data1: ptr1, 
-field_decl val: ptr1, 
+return_expr : ptr1, 
+init_expr : ptr1, 
+result_decl : ptr1, 
+integer_type : ptr1, 
+type_decl int: ptr1, 
 integer_cst 32: ptr1, 
-type_decl Data1: ptr1, 
+integer_cst -2147483648: ptr1, 
+integer_cst 2147483647: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst 1: ptr1, 
+decl_expr : ptr1, 
+var_decl ptr2: 
+decl_expr : ptr1, 
+var_decl val: 
+integer_cst 32: 
+component_ref : 
+indirect_ref : 
+var_decl ptr2: 
+field_decl val: 
+integer_cst 32: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+var_decl ptr2: ptr1, 
+integer_cst 64: 
+parm_decl ptr1: 
+pointer_type : 
+void_type : 
+type_decl void: 
+integer_cst 64: 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+type_decl Data1: 
+block : ptr1, 
+var_decl ptr2: 
+var_decl val: 
+function_decl func4: 
+bind_expr : ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
@@ -748,6 +739,8 @@ ne_expr :
 var_decl ptr2: 
 integer_cst 0: 
 bind_expr : 
+decl_expr : 
+var_decl k: 
 var_decl k: 
 integer_cst 32: 
 component_ref : 
@@ -767,20 +760,11 @@ type_decl int:
 integer_cst 32: 
 integer_cst -2147483648: 
 integer_cst 2147483647: 
-decl_expr : 
-var_decl k: 
 block : 
 var_decl k: 
 block : ptr1, 
 block : ptr1, 
 var_decl k: ptr1, 
-block : ptr1, 
-var_decl ptr2: ptr1, 
-block : ptr1, 
-block : ptr1, 
-var_decl k: ptr1, 
-function_decl func5: 
-bind_expr : ptr1, 
 var_decl ptr2: ptr1, 
 integer_cst 64: ptr1, 
 integer_cst 0: ptr1, 
@@ -790,6 +774,13 @@ type_decl Data1: ptr1,
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
 type_decl Data1: ptr1, 
+block : ptr1, 
+var_decl ptr2: ptr1, 
+block : ptr1, 
+block : ptr1, 
+var_decl k: ptr1, 
+function_decl func5: 
+bind_expr : ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
@@ -823,15 +814,6 @@ eq_expr :
 var_decl z: 
 integer_cst 12: 
 bind_expr : 
-var_decl ptr3: 
-integer_cst 64: 
-var_decl ptr2: 
-pointer_type : 
-record_type : 
-type_decl Data1: 
-field_decl val: 
-integer_cst 32: 
-type_decl Data1: 
 statement_list : 
 decl_expr : 
 var_decl ptr3: 
@@ -858,6 +840,8 @@ field_decl val:
 integer_cst 32: 
 integer_cst 10: 
 bind_expr : 
+decl_expr : 
+var_decl k2: 
 var_decl k2: 
 integer_cst 32: 
 plus_expr : 
@@ -879,8 +863,6 @@ type_decl int:
 integer_cst 32: 
 integer_cst -2147483648: 
 integer_cst 2147483647: 
-decl_expr : 
-var_decl k2: 
 block : 
 var_decl k2: 
 block : 
@@ -895,6 +877,15 @@ block :
 block : 
 block : 
 var_decl k2: 
+var_decl ptr3: 
+integer_cst 64: 
+var_decl ptr2: 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+type_decl Data1: 
 block : 
 var_decl ptr3: 
 block : 
@@ -910,6 +901,15 @@ block : ptr1,
 block : ptr1, 
 block : ptr1, 
 var_decl k2: ptr1, 
+var_decl ptr2: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+type_decl Data1: ptr1, 
 block : ptr1, 
 var_decl ptr2: ptr1, 
 var_decl z: ptr1, 
@@ -923,15 +923,6 @@ block : ptr1,
 var_decl k2: ptr1, 
 function_decl func6: 
 bind_expr : ptr1, 
-var_decl ptr2: ptr1, 
-integer_cst 64: ptr1, 
-integer_cst 0: ptr1, 
-pointer_type : ptr1, 
-record_type : ptr1, 
-type_decl Data1: ptr1, 
-field_decl val: ptr1, 
-integer_cst 32: ptr1, 
-type_decl Data1: ptr1, 
 statement_list : ptr1, 
 cleanup_point_expr : ptr1, 
 decl_expr : ptr1, 
@@ -978,6 +969,15 @@ type_decl Data1:
 integer_cst 64: 
 field_decl val: 
 integer_cst 32: 
+var_decl ptr2: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+type_decl Data1: ptr1, 
 block : ptr1, 
 var_decl ptr2: ptr1, 
 function_decl fill: 
@@ -1043,22 +1043,6 @@ integer_cst : __it,
 integer_cst 64: __it, 
 function_decl __fill_a: 
 bind_expr : __first, __last, 
-var_decl __tmp: __first, __last, 
-integer_cst 32: __first, __last, 
-indirect_ref : __first, __last, 
-parm_decl __value: __first, __last, 
-reference_type : __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
-integer_cst 64: __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
 statement_list : __first, __last, 
 decl_expr : __first, __last, 
 var_decl __tmp: __first, __last, 
@@ -1106,6 +1090,22 @@ integer_cst 0: __first, __last,
 integer_cst : __first, __last, 
 integer_cst 64: __first, __last, 
 var_decl __tmp: __first, __last, 
+var_decl __tmp: __first, __last, 
+integer_cst 32: __first, __last, 
+indirect_ref : __first, __last, 
+parm_decl __value: __first, __last, 
+reference_type : __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
+integer_cst 64: __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
 block : __first, __last, 
 var_decl __tmp: __first, __last, 
 function_decl _S_base: 
diff --git a/test/test22-01.txt b/test/test22-01.txt
index 418413e..1fcafd3 100644
--- a/test/test22-01.txt
+++ b/test/test22-01.txt
@@ -13064,7 +13064,507 @@ function_decl fill /usr/include/c++/5/bits/stl_bvector.h 398:3
           type_decl bool <built-in> 0:0 - type name
           - isAutogenerated: 1
         integer_cst 64 - parm size
-function_decl ftest test22.cpp 7:9
+function_decl Data1 test22.cpp 7: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6: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 8: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 7:11 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 9:5 - code
+  statement_list - operand
+  block - operand
+function_decl __base_ctor  test22.cpp 7: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6: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 9: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 7:11 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 9:5 - code
+  statement_list - operand
+  block - operand
+function_decl __comp_ctor  test22.cpp 7: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6: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 9: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 7:11 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl Data1 test22.cpp 11: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 11:24 - function result
+ - isAutogenerated: 1
+  void_type - result type
+   type_decl void <built-in> 0:0 - type name
+   - isAutogenerated: 1
+ parm_decl this test22.cpp 11:22 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr0 test22.cpp 11:18 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 14:5 - code
+  cleanup_point_expr test22.cpp 12:20 - operand
+   expr_stmt test22.cpp 12:20 - operand
+    convert_expr - expresssion
+     init_expr - operand
+      component_ref test22.cpp 12:20 - operand
+       indirect_ref - object
+        nop_expr - ref
+         parm_decl this test22.cpp 11:22 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data1 test22.cpp 5:8 - type name
+            - isAutogenerated: 1
+            field_decl val test22.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+      - isUsed: 1
+      parm_decl ptr0 test22.cpp 11:18 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+  block - operand
+function_decl __base_ctor  test22.cpp 11: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 14: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 11:22 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr0 test22.cpp 11:18 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 14:5 - code
+  cleanup_point_expr test22.cpp 12:20 - operand
+   expr_stmt test22.cpp 12:20 - operand
+    convert_expr - expresssion
+     init_expr - operand
+      component_ref test22.cpp 12:20 - operand
+       indirect_ref - object
+        nop_expr - ref
+         parm_decl this test22.cpp 11:22 - operand
+         - isAutogenerated: 1
+          pointer_type - decl type
+           record_type - nested type
+            type_decl Data1 test22.cpp 5:8 - type name
+            - isAutogenerated: 1
+            field_decl val test22.cpp 16:9 - field
+            - signed
+             integer_cst 32 - decl size
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
+            - isAutogenerated: 1
+          integer_cst 64 - parm size
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+      - isUsed: 1
+      parm_decl ptr0 test22.cpp 11:18 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+  block - operand
+function_decl __comp_ctor  test22.cpp 11: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 Data1 test22.cpp 5:8 - type name
+   - isAutogenerated: 1
+   field_decl val test22.cpp 16:9 - field
+   - signed
+    integer_cst 32 - decl size
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 14: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 11:22 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr0 test22.cpp 11:18 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ statement_list - code
+function_decl ftest1 test22.cpp 19:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -13076,28 +13576,34 @@ function_decl ftest test22.cpp 7:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Data1 test22.cpp 3:8 - type name
+   type_decl Data1 test22.cpp 5:8 - type name
    - isAutogenerated: 1
-   field_decl val test22.cpp 5:9 - field
+   field_decl val test22.cpp 16:9 - field
    - signed
     integer_cst 32 - decl size
-   type_decl Data1 test22.cpp 4:1 - field
+   field_decl ptrval test22.cpp 17:12 - field
+   - unsigned
+    integer_cst 64 - decl size
+   type_decl Data1 test22.cpp 6:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6: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 8:5 - function result
+ result_decl test22.cpp 20:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -13108,21 +13614,91 @@ function_decl ftest test22.cpp 7:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 7:15 - argument
+ parm_decl this test22.cpp 19:16 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ return_expr test22.cpp 21:16 - code
+  init_expr - operand
+   result_decl test22.cpp 20:5 - operand
+   - isAutogenerated: 1
+    integer_type - result type
+    - precisionBits: 32
+    - signed
+     type_decl int <built-in> 0:0 - type name
+     - isAutogenerated: 1
+     integer_cst 32 - type size
+     integer_cst -2147483648 - min value
+     integer_cst 2147483647 - max value
+    integer_cst 32 - decl size
+   integer_cst 1 - operand
+function_decl ftest2 test22.cpp 24:16
+- isPublic: 1
+ function_type - function type
+  integer_type - function return type
+  - precisionBits: 32
+  - signed
+   type_decl int <built-in> 0:0 - type name
+   - isAutogenerated: 1
+   integer_cst 32 - type size
+   integer_cst -2147483648 - min value
+   integer_cst 2147483647 - max value
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Data1 test22.cpp 5:8 - type name
+     - isAutogenerated: 1
+     field_decl val test22.cpp 16:9 - field
+     - signed
+      integer_cst 32 - decl size
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6: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 25:5 - function result
  - isAutogenerated: 1
+  integer_type - result type
+  - precisionBits: 32
+  - signed
+   type_decl int <built-in> 0:0 - type name
+   - isAutogenerated: 1
+   integer_cst 32 - type size
+   integer_cst -2147483648 - min value
+   integer_cst 2147483647 - max value
+  integer_cst 32 - decl size
+ parm_decl ptr0 test22.cpp 24:30 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test22.cpp 3:8 - type name
+    type_decl Data1 test22.cpp 5:8 - type name
     - isAutogenerated: 1
-    field_decl val test22.cpp 5:9 - field
+    field_decl val test22.cpp 16:9 - field
     - signed
      integer_cst 32 - decl size
-    type_decl Data1 test22.cpp 4:1 - field
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- return_expr test22.cpp 9:16 - code
+ return_expr test22.cpp 26:16 - code
   init_expr - operand
-   result_decl test22.cpp 8:5 - operand
+   result_decl test22.cpp 25:5 - operand
    - isAutogenerated: 1
     integer_type - result type
     - precisionBits: 32
@@ -13134,7 +13710,7 @@ function_decl ftest test22.cpp 7:9
      integer_cst 2147483647 - max value
     integer_cst 32 - decl size
    integer_cst 1 - operand
-function_decl func1 test22.cpp 17:9
+function_decl func1 test22.cpp 34:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -13146,32 +13722,35 @@ function_decl func1 test22.cpp 17:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Object1 test22.cpp 15:7 - type name
+   type_decl Object1 test22.cpp 32:7 - type name
    - isAutogenerated: 1
-   type_decl Object1 test22.cpp 16:1 - field
+   type_decl Object1 test22.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test22.cpp 15:7 - type name
+     type_decl Object1 test22.cpp 32:7 - type name
      - isAutogenerated: 1
-     type_decl Object1 test22.cpp 16:1 - field
+     type_decl Object1 test22.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 18:5 - function result
+ result_decl test22.cpp 35:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -13182,29 +13761,32 @@ function_decl func1 test22.cpp 17:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 17:32 - argument
+ parm_decl this test22.cpp 34:32 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test22.cpp 15:7 - type name
+    type_decl Object1 test22.cpp 32:7 - type name
     - isAutogenerated: 1
-    type_decl Object1 test22.cpp 16:1 - field
+    type_decl Object1 test22.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 17:28 - argument
+ parm_decl ptr1 test22.cpp 34:28 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test22.cpp 3:8 - type name
+    type_decl Data1 test22.cpp 5:8 - type name
     - isAutogenerated: 1
-    field_decl val test22.cpp 5:9 - field
+    field_decl val test22.cpp 16:9 - field
     - signed
      integer_cst 32 - decl size
-    type_decl Data1 test22.cpp 4:1 - field
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 20:29 - code
-  var_decl vec1 test22.cpp 19:29 - operand
+ bind_expr test22.cpp 37:29 - code
+  var_decl vec1 test22.cpp 36:29 - operand
   - isUsed: 1
    integer_cst 192 - decl size
    record_type - var type
@@ -13238,45 +13820,48 @@ function_decl func1 test22.cpp 17: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 19:29 - statement
-    var_decl vec1 test22.cpp 19:29 - operand
+   decl_expr test22.cpp 36:29 - statement
+    var_decl vec1 test22.cpp 36:29 - operand
     - isUsed: 1
-   cleanup_point_expr test22.cpp 19:29 - statement
-    expr_stmt test22.cpp 19:29 - operand
-     call_expr test22.cpp 19:29 - expresssion
+   cleanup_point_expr test22.cpp 36:29 - statement
+    expr_stmt test22.cpp 36:29 - operand
+     call_expr test22.cpp 36: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 19:29 - operand
+       var_decl vec1 test22.cpp 36:29 - operand
        - isUsed: 1
-   cleanup_stmt test22.cpp 19:29 - statement
+   cleanup_stmt test22.cpp 36:29 - statement
     statement_list - body
-     cleanup_point_expr test22.cpp 20:29 - statement
-      expr_stmt test22.cpp 20:29 - operand
-       call_expr test22.cpp 20:23 - expresssion
+     cleanup_point_expr test22.cpp 37:29 - statement
+      expr_stmt test22.cpp 37:29 - operand
+       call_expr test22.cpp 37: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 19:29 - operand
+         var_decl vec1 test22.cpp 36:29 - operand
          - isUsed: 1
         nop_expr - arg
          addr_expr - operand
           - isUsed: 1
-          parm_decl ptr1 test22.cpp 17:28 - operand
+          parm_decl ptr1 test22.cpp 34:28 - operand
            pointer_type - decl type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
            integer_cst 64 - parm size
     call_expr - expresssion
@@ -13286,14 +13871,14 @@ function_decl func1 test22.cpp 17:9
       - isPublic: 1
        method_type - function type
      addr_expr - arg
-      var_decl vec1 test22.cpp 19:29 - operand
+      var_decl vec1 test22.cpp 36:29 - operand
       - isUsed: 1
-    var_decl vec1 test22.cpp 19:29 - decl
+    var_decl vec1 test22.cpp 36:29 - decl
     - isUsed: 1
   block - operand
-   var_decl vec1 test22.cpp 19:29 - block vars
+   var_decl vec1 test22.cpp 36:29 - block vars
    - isUsed: 1
-function_decl func2 test22.cpp 23:9
+function_decl func2 test22.cpp 40:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -13305,32 +13890,35 @@ function_decl func2 test22.cpp 23:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Object1 test22.cpp 15:7 - type name
+   type_decl Object1 test22.cpp 32:7 - type name
    - isAutogenerated: 1
-   type_decl Object1 test22.cpp 16:1 - field
+   type_decl Object1 test22.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test22.cpp 15:7 - type name
+     type_decl Object1 test22.cpp 32:7 - type name
      - isAutogenerated: 1
-     type_decl Object1 test22.cpp 16:1 - field
+     type_decl Object1 test22.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 24:5 - function result
+ result_decl test22.cpp 41:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -13341,59 +13929,68 @@ function_decl func2 test22.cpp 23:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 23:32 - argument
+ parm_decl this test22.cpp 40:32 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test22.cpp 15:7 - type name
+    type_decl Object1 test22.cpp 32:7 - type name
     - isAutogenerated: 1
-    type_decl Object1 test22.cpp 16:1 - field
+    type_decl Object1 test22.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 23:28 - argument
+ parm_decl ptr1 test22.cpp 40:28 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test22.cpp 3:8 - type name
+    type_decl Data1 test22.cpp 5:8 - type name
     - isAutogenerated: 1
-    field_decl val test22.cpp 5:9 - field
+    field_decl val test22.cpp 16:9 - field
     - signed
      integer_cst 32 - decl size
-    type_decl Data1 test22.cpp 4:1 - field
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 25:31 - code
-  var_decl ptr2 test22.cpp 25:16 - operand
+ bind_expr test22.cpp 42:31 - code
+  var_decl ptr2 test22.cpp 42:16 - operand
    integer_cst 64 - decl size
-   pointer_plus_expr test22.cpp 25:28 - initial
+   pointer_plus_expr test22.cpp 42:28 - initial
     nop_expr - operand
      - isUsed: 1
-     parm_decl ptr1 test22.cpp 23:28 - operand
+     parm_decl ptr1 test22.cpp 40:28 - operand
       pointer_type - decl type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
       integer_cst 64 - parm size
-    integer_cst 4 - operand
+    integer_cst 16 - operand
    pointer_type - var type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
-  decl_expr test22.cpp 25:30 - operand
-   var_decl ptr2 test22.cpp 25:16 - operand
+  decl_expr test22.cpp 42:30 - operand
+   var_decl ptr2 test22.cpp 42:16 - operand
   block - operand
-   var_decl ptr2 test22.cpp 25:16 - block vars
-function_decl func3 test22.cpp 28:9
+   var_decl ptr2 test22.cpp 42:16 - block vars
+function_decl func3 test22.cpp 45:9
 - isPublic: 1
  method_type - function type
   integer_type - method return type
@@ -13405,32 +14002,35 @@ function_decl func3 test22.cpp 28:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   record_type - method base type
-   type_decl Object1 test22.cpp 15:7 - type name
+   type_decl Object1 test22.cpp 32:7 - type name
    - isAutogenerated: 1
-   type_decl Object1 test22.cpp 16:1 - field
+   type_decl Object1 test22.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test22.cpp 15:7 - type name
+     type_decl Object1 test22.cpp 32:7 - type name
      - isAutogenerated: 1
-     type_decl Object1 test22.cpp 16:1 - field
+     type_decl Object1 test22.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 29:5 - function result
+ result_decl test22.cpp 46:5 - function result
  - isAutogenerated: 1
   integer_type - result type
   - precisionBits: 32
@@ -13441,156 +14041,497 @@ function_decl func3 test22.cpp 28:9
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - decl size
- parm_decl this test22.cpp 28:26 - argument
+ parm_decl this test22.cpp 45:26 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test22.cpp 15:7 - type name
+    type_decl Object1 test22.cpp 32:7 - type name
     - isAutogenerated: 1
-    type_decl Object1 test22.cpp 16:1 - field
+    type_decl Object1 test22.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 28:22 - argument
+ parm_decl ptr1 test22.cpp 45:22 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test22.cpp 3:8 - type name
+    type_decl Data1 test22.cpp 5:8 - type name
     - isAutogenerated: 1
-    field_decl val test22.cpp 5:9 - field
+    field_decl val test22.cpp 16:9 - field
     - signed
      integer_cst 32 - decl size
-    type_decl Data1 test22.cpp 4:1 - field
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- bind_expr test22.cpp 31:26 - code
-  var_decl ptr2 test22.cpp 30:17 - operand
+ bind_expr test22.cpp 48:26 - code
+  var_decl ptr2 test22.cpp 47:17 - operand
   - isUsed: 1
    integer_cst 64 - decl size
    addr_expr - initial
     - isUsed: 1
-    parm_decl ptr1 test22.cpp 28:22 - operand
+    parm_decl ptr1 test22.cpp 45:22 - operand
      pointer_type - decl type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
      integer_cst 64 - parm size
    pointer_type - var type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   statement_list - operand
-   decl_expr test22.cpp 30:25 - statement
-    var_decl ptr2 test22.cpp 30:17 - operand
+   decl_expr test22.cpp 47:25 - statement
+    var_decl ptr2 test22.cpp 47:17 - operand
     - isUsed: 1
-   cleanup_point_expr test22.cpp 31:26 - statement
-    expr_stmt test22.cpp 31:26 - operand
+   cleanup_point_expr test22.cpp 48:26 - statement
+    expr_stmt test22.cpp 48:26 - operand
      convert_expr - expresssion
       modify_expr - operand
-       component_ref test22.cpp 31:18 - operand
+       component_ref test22.cpp 48:18 - operand
         indirect_ref - object
          indirect_ref - ref
-          var_decl ptr2 test22.cpp 30:17 - ref
+          var_decl ptr2 test22.cpp 47:17 - ref
           - isUsed: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
        integer_cst 10 - operand
   block - operand
-   var_decl ptr2 test22.cpp 30:17 - block vars
+   var_decl ptr2 test22.cpp 47:17 - block vars
    - isUsed: 1
-function_decl func4 test22.cpp 34:10
+function_decl func4 test22.cpp 51: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 15:7 - type name
+   type_decl Object1 test22.cpp 32:7 - type name
    - isAutogenerated: 1
-   type_decl Object1 test22.cpp 16:1 - field
+   type_decl Object1 test22.cpp 33:1 - field
    - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     record_type - nested type
-     type_decl Object1 test22.cpp 15:7 - type name
+     type_decl Object1 test22.cpp 32:7 - type name
      - isAutogenerated: 1
-     type_decl Object1 test22.cpp 16:1 - field
+     type_decl Object1 test22.cpp 33:1 - field
      - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 35:5 - function result
+ result_decl test22.cpp 52: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 34:33 - argument
+ parm_decl this test22.cpp 51:33 - argument
  - isAutogenerated: 1
   pointer_type - decl type
    record_type - nested type
-    type_decl Object1 test22.cpp 15:7 - type name
+    type_decl Object1 test22.cpp 32:7 - type name
     - isAutogenerated: 1
-    type_decl Object1 test22.cpp 16:1 - field
+    type_decl Object1 test22.cpp 33:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
- parm_decl ptr1 test22.cpp 34:29 - argument
+ parm_decl ptr1 test22.cpp 51:29 - argument
   pointer_type - decl type
    record_type - nested type
-    type_decl Data1 test22.cpp 3:8 - type name
+    type_decl Data1 test22.cpp 5:8 - type name
     - isAutogenerated: 1
-    field_decl val test22.cpp 5:9 - field
+    field_decl val test22.cpp 16:9 - field
     - signed
      integer_cst 32 - decl size
-    type_decl Data1 test22.cpp 4:1 - field
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
     - isAutogenerated: 1
   integer_cst 64 - parm size
- if_stmt test22.cpp 36:9 - code
+ if_stmt test22.cpp 53:9 - code
   cleanup_point_expr - condition
-   eq_expr test22.cpp 36:27 - operand
-    call_expr test22.cpp 36:24 - operand
+   eq_expr test22.cpp 53:28 - operand
+    call_expr test22.cpp 53:25 - operand
      addr_expr - function
-      function_decl ftest test22.cpp 7:9 - operand
+      function_decl ftest1 test22.cpp 19:9 - operand
       - isExternal: 1
       - isPublic: 1
        method_type - function type
      nop_expr - arg
       - isUsed: 1
-      parm_decl ptr1 test22.cpp 34:29 - operand
+      parm_decl ptr1 test22.cpp 51:29 - operand
        pointer_type - decl type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
        integer_cst 64 - parm size
     integer_cst 100 - operand
-  return_expr test22.cpp 38:13 - then
+  return_expr test22.cpp 55:13 - then
+function_decl func5 test22.cpp 59: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 32:7 - type name
+   - isAutogenerated: 1
+   type_decl Object1 test22.cpp 33:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test22.cpp 32:7 - type name
+     - isAutogenerated: 1
+     type_decl Object1 test22.cpp 33:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 60: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 59:27 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test22.cpp 32:7 - type name
+    - isAutogenerated: 1
+    type_decl Object1 test22.cpp 33:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test22.cpp 59:23 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 61:25 - code
+  var_decl data test22.cpp 61:15 - operand
+  - isUsed: 1
+   integer_cst 128 - decl size
+   record_type - var type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  statement_list - operand
+   decl_expr test22.cpp 61:24 - statement
+    var_decl data test22.cpp 61:15 - operand
+    - isUsed: 1
+   cleanup_point_expr test22.cpp 61:24 - statement
+    expr_stmt test22.cpp 61:24 - operand
+     call_expr test22.cpp 61:24 - expresssion
+      addr_expr - function
+       function_decl __comp_ctor  test22.cpp 11:5 - operand
+       - isPublic: 1
+        method_type - function type
+      addr_expr - arg
+       var_decl data test22.cpp 61:15 - operand
+       - isUsed: 1
+      - isUsed: 1
+      parm_decl ptr1 test22.cpp 59:23 - arg
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+  block - operand
+   var_decl data test22.cpp 61:15 - block vars
+   - isUsed: 1
+function_decl func6 test22.cpp 64: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 32:7 - type name
+   - isAutogenerated: 1
+   type_decl Object1 test22.cpp 33:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test22.cpp 32:7 - type name
+     - isAutogenerated: 1
+     type_decl Object1 test22.cpp 33:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 65: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:33 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test22.cpp 32:7 - type name
+    - isAutogenerated: 1
+    type_decl Object1 test22.cpp 33:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test22.cpp 64:29 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ bind_expr test22.cpp 68:28 - code
+  var_decl num test22.cpp 68:13 - operand
+   integer_cst 32 - decl size
+   component_ref test22.cpp 68:25 - initial
+    indirect_ref - object
+     nop_expr - ref
+      - isUsed: 1
+      parm_decl ptr1 test22.cpp 64:29 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+   integer_type - var type
+   - precisionBits: 32
+   - signed
+    type_decl int <built-in> 0:0 - type name
+    - isAutogenerated: 1
+    integer_cst 32 - type size
+    integer_cst -2147483648 - min value
+    integer_cst 2147483647 - max value
+  statement_list - operand
+   if_stmt test22.cpp 66:9 - statement
+    eq_expr test22.cpp 66:14 - condition
+     nop_expr - operand
+      - isUsed: 1
+      parm_decl ptr1 test22.cpp 64:29 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+     integer_cst 0 - operand
+    return_expr test22.cpp 67:13 - then
+   decl_expr test22.cpp 68:25 - statement
+    var_decl num test22.cpp 68:13 - operand
+  block - operand
+   var_decl num test22.cpp 68:13 - block vars
+function_decl func7 test22.cpp 71: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 32:7 - type name
+   - isAutogenerated: 1
+   type_decl Object1 test22.cpp 33:1 - field
+   - isAutogenerated: 1
+  tree_list - arg types
+   pointer_type - value
+    record_type - nested type
+     type_decl Object1 test22.cpp 32:7 - type name
+     - isAutogenerated: 1
+     type_decl Object1 test22.cpp 33:1 - field
+     - isAutogenerated: 1
+   tree_list - chain
+    pointer_type - value
+     record_type - nested type
+      type_decl Data1 test22.cpp 5:8 - type name
+      - isAutogenerated: 1
+      field_decl val test22.cpp 16:9 - field
+      - signed
+       integer_cst 32 - decl size
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6: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 72: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 71:33 - argument
+ - isAutogenerated: 1
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Object1 test22.cpp 32:7 - type name
+    - isAutogenerated: 1
+    type_decl Object1 test22.cpp 33:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ - isUsed: 1
+ parm_decl ptr1 test22.cpp 71:29 - argument
+  pointer_type - decl type
+   record_type - nested type
+    type_decl Data1 test22.cpp 5:8 - type name
+    - isAutogenerated: 1
+    field_decl val test22.cpp 16:9 - field
+    - signed
+     integer_cst 32 - decl size
+    field_decl ptrval test22.cpp 17:12 - field
+    - unsigned
+     integer_cst 64 - decl size
+    type_decl Data1 test22.cpp 6:1 - field
+    - isAutogenerated: 1
+  integer_cst 64 - parm size
+ if_stmt test22.cpp 73:9 - code
+  cleanup_point_expr - condition
+   eq_expr test22.cpp 73:33 - operand
+    call_expr test22.cpp 73:26 - operand
+     addr_expr - function
+      function_decl ftest2 test22.cpp 24:16 - operand
+      - isExternal: 1
+      - isPublic: 1
+       function_type - function type
+     nop_expr - arg
+      - isUsed: 1
+      parm_decl ptr1 test22.cpp 71:29 - operand
+       pointer_type - decl type
+        record_type - nested type
+         type_decl Data1 test22.cpp 5:8 - type name
+         - isAutogenerated: 1
+         field_decl val test22.cpp 16:9 - field
+         - signed
+          integer_cst 32 - decl size
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
+         - isAutogenerated: 1
+       integer_cst 64 - parm size
+    integer_cst 200 - operand
+  return_expr test22.cpp 75:13 - then
 function_decl fill /usr/include/c++/5/bits/stl_algobase.h 736:5
 - isPublic: 1
  function_type - function type
@@ -15216,12 +16157,15 @@ function_decl push_back /usr/include/c++/5/bits/stl_vector.h 913:7
      pointer_type - nested type
       type_decl value_type /usr/include/c++/5/bits/stl_vector.h 226:24 - type name
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -15273,12 +16217,15 @@ function_decl push_back /usr/include/c++/5/bits/stl_vector.h 913:7
    pointer_type - nested type
     type_decl value_type /usr/include/c++/5/bits/stl_vector.h 226:24 - type name
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  if_stmt /usr/include/c++/5/bits/stl_vector.h 915:2 - code
@@ -15499,12 +16446,15 @@ function_decl push_back /usr/include/c++/5/bits/stl_vector.h 913:7
           pointer_type - nested type
            type_decl value_type /usr/include/c++/5/bits/stl_vector.h 226:24 - type name
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
    cleanup_point_expr /usr/include/c++/5/bits/stl_vector.h 919:6 - statement
@@ -15672,12 +16622,15 @@ function_decl push_back /usr/include/c++/5/bits/stl_vector.h 913:7
          pointer_type - nested type
           type_decl value_type /usr/include/c++/5/bits/stl_vector.h 226:24 - type name
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
 function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
@@ -17211,22 +18164,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 113:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17286,22 +18245,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 113:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17350,22 +18315,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 113:7
          tree_vec - element
           pointer_type - element
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          tree_vec - element
           pointer_type - element
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
         record_type - value
          type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17421,23 +18392,29 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      reference_type - value
@@ -17450,22 +18427,28 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
           tree_vec - element
            pointer_type - element
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
           tree_vec - element
            pointer_type - element
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
          record_type - value
           type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17496,12 +18479,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -17509,12 +18495,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  parm_decl /usr/include/c++/5/bits/stl_construct.h 149:21 - argument
@@ -17528,22 +18517,28 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17574,12 +18569,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
      pointer_type - decl type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
     - isUsed: 1
@@ -17587,12 +18585,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 148:5
      pointer_type - decl type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
 function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
@@ -17612,22 +18613,28 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17649,23 +18656,29 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
      type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      reference_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -17688,22 +18701,28 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17727,12 +18746,15 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
    type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -17740,12 +18762,15 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
   reference_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/ext/alloc_traits.h 189:9 - code
@@ -17770,22 +18795,28 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
            record_type - value
             type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -17809,12 +18840,15 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
       type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
     nop_expr - arg
@@ -17824,12 +18858,15 @@ function_decl construct /usr/include/c++/5/ext/alloc_traits.h 188:19
        reference_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
 function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
@@ -17919,12 +18956,15 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
      reference_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -17992,12 +19032,15 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
   reference_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/vector.tcc 400:2 - code
@@ -18115,22 +19158,28 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
          reference_type - decl type
           pointer_type - nested type
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
       pointer_type - var type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      statement_list - operand
       cleanup_point_expr /usr/include/c++/5/bits/vector.tcc 332:4 - statement
@@ -18700,12 +19749,15 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
          type_decl pointer /usr/include/c++/5/bits/stl_vector.h 227:58 - type name
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
       cleanup_point_expr /usr/include/c++/5/bits/vector.tcc 353:48 - statement
        expr_stmt /usr/include/c++/5/bits/vector.tcc 353:48 - operand
@@ -18775,12 +19827,15 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
          type_decl pointer /usr/include/c++/5/bits/stl_vector.h 227:58 - type name
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
       try_block /usr/include/c++/5/bits/vector.tcc 355:4 - statement
        statement_list - body
@@ -18856,12 +19911,15 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
               reference_type - decl type
                pointer_type - nested type
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               integer_cst 64 - parm size
         cleanup_point_expr /usr/include/c++/5/bits/vector.tcc 368:8 - statement
@@ -20768,22 +21826,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 121:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -20811,22 +21875,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 121:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -20873,22 +21943,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 121:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -20943,22 +22019,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 121:7
                tree_vec - element
                 pointer_type - element
                  record_type - nested type
-                  type_decl Data1 test22.cpp 3:8 - type name
+                  type_decl Data1 test22.cpp 5:8 - type name
                   - isAutogenerated: 1
-                  field_decl val test22.cpp 5:9 - field
+                  field_decl val test22.cpp 16:9 - field
                   - signed
                    integer_cst 32 - decl size
-                  type_decl Data1 test22.cpp 4:1 - field
+                  field_decl ptrval test22.cpp 17:12 - field
+                  - unsigned
+                   integer_cst 64 - decl size
+                  type_decl Data1 test22.cpp 6:1 - field
                   - isAutogenerated: 1
                tree_vec - element
                 pointer_type - element
                  record_type - nested type
-                  type_decl Data1 test22.cpp 3:8 - type name
+                  type_decl Data1 test22.cpp 5:8 - type name
                   - isAutogenerated: 1
-                  field_decl val test22.cpp 5:9 - field
+                  field_decl val test22.cpp 16:9 - field
                   - signed
                    integer_cst 32 - decl size
-                  type_decl Data1 test22.cpp 4:1 - field
+                  field_decl ptrval test22.cpp 17:12 - field
+                  - unsigned
+                   integer_cst 64 - decl size
+                  type_decl Data1 test22.cpp 6:1 - field
                   - isAutogenerated: 1
               record_type - value
                type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -20991,22 +22073,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 121:7
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
              record_type - value
               type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21045,22 +22133,28 @@ function_decl __base_dtor  /usr/include/c++/5/bits/allocator.h 121:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21088,22 +22182,28 @@ function_decl __base_dtor  /usr/include/c++/5/bits/allocator.h 121:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21141,22 +22241,28 @@ function_decl __base_dtor  /usr/include/c++/5/bits/allocator.h 121:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21200,22 +22306,28 @@ function_decl __base_dtor  /usr/include/c++/5/bits/allocator.h 121:7
                tree_vec - element
                 pointer_type - element
                  record_type - nested type
-                  type_decl Data1 test22.cpp 3:8 - type name
+                  type_decl Data1 test22.cpp 5:8 - type name
                   - isAutogenerated: 1
-                  field_decl val test22.cpp 5:9 - field
+                  field_decl val test22.cpp 16:9 - field
                   - signed
                    integer_cst 32 - decl size
-                  type_decl Data1 test22.cpp 4:1 - field
+                  field_decl ptrval test22.cpp 17:12 - field
+                  - unsigned
+                   integer_cst 64 - decl size
+                  type_decl Data1 test22.cpp 6:1 - field
                   - isAutogenerated: 1
                tree_vec - element
                 pointer_type - element
                  record_type - nested type
-                  type_decl Data1 test22.cpp 3:8 - type name
+                  type_decl Data1 test22.cpp 5:8 - type name
                   - isAutogenerated: 1
-                  field_decl val test22.cpp 5:9 - field
+                  field_decl val test22.cpp 16:9 - field
                   - signed
                    integer_cst 32 - decl size
-                  type_decl Data1 test22.cpp 4:1 - field
+                  field_decl ptrval test22.cpp 17:12 - field
+                  - unsigned
+                   integer_cst 64 - decl size
+                  type_decl Data1 test22.cpp 6:1 - field
                   - isAutogenerated: 1
               record_type - value
                type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21248,22 +22360,28 @@ function_decl __base_dtor  /usr/include/c++/5/bits/allocator.h 121:7
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
              record_type - value
               type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21302,22 +22420,28 @@ function_decl __comp_dtor  /usr/include/c++/5/bits/allocator.h 121:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21345,22 +22469,28 @@ function_decl __comp_dtor  /usr/include/c++/5/bits/allocator.h 121:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21398,22 +22528,28 @@ function_decl __comp_dtor  /usr/include/c++/5/bits/allocator.h 121:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -21471,12 +22607,15 @@ function_decl _M_deallocate /usr/include/c++/5/bits/stl_vector.h 174:7
      type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      integer_type - value
@@ -21518,12 +22657,15 @@ function_decl _M_deallocate /usr/include/c++/5/bits/stl_vector.h 174:7
    type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -21545,12 +22687,15 @@ function_decl _M_deallocate /usr/include/c++/5/bits/stl_vector.h 174:7
       type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
     integer_cst 0 - operand
@@ -21595,12 +22740,15 @@ function_decl _M_deallocate /usr/include/c++/5/bits/stl_vector.h 174:7
         type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
       - isUsed: 1
@@ -21624,23 +22772,29 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 122:5
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -21656,12 +22810,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 122:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -21669,12 +22826,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 122:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_construct.h 127:28 - code
@@ -21692,12 +22852,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 122:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -21705,12 +22868,15 @@ function_decl _Destroy /usr/include/c++/5/bits/stl_construct.h 122:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
   block - operand
@@ -21754,23 +22920,29 @@ function_decl construct /usr/include/c++/5/ext/new_allocator.h 129:7
      type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      reference_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -21804,12 +22976,15 @@ function_decl construct /usr/include/c++/5/ext/new_allocator.h 129:7
    type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -21817,12 +22992,15 @@ function_decl construct /usr/include/c++/5/ext/new_allocator.h 129:7
   reference_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/ext/new_allocator.h 130:9 - code
@@ -21846,12 +23024,15 @@ function_decl construct /usr/include/c++/5/ext/new_allocator.h 129:7
            type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
           integer_cst 64 - parm size
        target_expr - operand
@@ -21892,12 +23073,15 @@ function_decl construct /usr/include/c++/5/ext/new_allocator.h 129:7
              reference_type - decl type
               pointer_type - nested type
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
              integer_cst 64 - parm size
          call_expr /usr/include/c++/5/ext/new_allocator.h 130:9 - operand
@@ -21924,12 +23108,15 @@ function_decl base /usr/include/c++/5/bits/stl_iterator.h 805:7
    pointer_type - nested type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   record_type - method base type
    type_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 721:11 - type name
@@ -21973,12 +23160,15 @@ function_decl base /usr/include/c++/5/bits/stl_iterator.h 805:7
    pointer_type - nested type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -22009,12 +23199,15 @@ function_decl base /usr/include/c++/5/bits/stl_iterator.h 805:7
      pointer_type - nested type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
     integer_cst 64 - decl size
    nop_expr - operand
@@ -22051,45 +23244,57 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -22100,12 +23305,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -22113,12 +23321,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -22126,12 +23337,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -22139,12 +23353,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 646:18 - code
@@ -22155,12 +23372,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 645:8 - operand
@@ -22180,12 +23400,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 645:54 - arg
@@ -22199,12 +23422,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      - isUsed: 1
@@ -22212,12 +23438,15 @@ function_decl copy_backward /usr/include/c++/5/bits/stl_algobase.h 634:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl operator* /usr/include/c++/5/bits/stl_iterator.h 753:7
@@ -22227,12 +23456,15 @@ function_decl operator* /usr/include/c++/5/bits/stl_iterator.h 753:7
    type_decl reference /usr/include/c++/5/bits/stl_iterator.h 733:50 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   record_type - method base type
    type_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 721:11 - type name
@@ -22276,12 +23508,15 @@ function_decl operator* /usr/include/c++/5/bits/stl_iterator.h 753:7
    type_decl reference /usr/include/c++/5/bits/stl_iterator.h 733:50 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -22312,12 +23547,15 @@ function_decl operator* /usr/include/c++/5/bits/stl_iterator.h 753:7
      type_decl reference /usr/include/c++/5/bits/stl_iterator.h 733:50 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     integer_cst 64 - decl size
    nop_expr - operand
@@ -23316,12 +24554,15 @@ function_decl _M_allocate /usr/include/c++/5/bits/stl_vector.h 167:7
    type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   record_type - method base type
    type_decl _Vector_base /usr/include/c++/5/bits/stl_vector.h 72:12 - type name
@@ -23368,12 +24609,15 @@ function_decl _M_allocate /usr/include/c++/5/bits/stl_vector.h 167:7
    type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -23414,12 +24658,15 @@ function_decl _M_allocate /usr/include/c++/5/bits/stl_vector.h 167:7
        type_decl pointer /usr/include/c++/5/bits/stl_vector.h 77:9 - type name
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - decl size
      cond_expr - operand
@@ -23486,45 +24733,57 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       reference_type - value
@@ -23537,22 +24796,28 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
            tree_vec - element
             pointer_type - element
              record_type - nested type
-              type_decl Data1 test22.cpp 3:8 - type name
+              type_decl Data1 test22.cpp 5:8 - type name
               - isAutogenerated: 1
-              field_decl val test22.cpp 5:9 - field
+              field_decl val test22.cpp 16:9 - field
               - signed
                integer_cst 32 - decl size
-              type_decl Data1 test22.cpp 4:1 - field
+              field_decl ptrval test22.cpp 17:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Data1 test22.cpp 6:1 - field
               - isAutogenerated: 1
            tree_vec - element
             pointer_type - element
              record_type - nested type
-              type_decl Data1 test22.cpp 3:8 - type name
+              type_decl Data1 test22.cpp 5:8 - type name
               - isAutogenerated: 1
-              field_decl val test22.cpp 5:9 - field
+              field_decl val test22.cpp 16:9 - field
               - signed
                integer_cst 32 - decl size
-              type_decl Data1 test22.cpp 4:1 - field
+              field_decl ptrval test22.cpp 17:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Data1 test22.cpp 6:1 - field
               - isAutogenerated: 1
           record_type - value
            type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23578,12 +24843,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -23591,12 +24859,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -23604,12 +24875,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -23617,12 +24891,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -23637,22 +24914,28 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23678,12 +24961,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_uninitialized.h 303:2 - operand
@@ -23697,12 +24983,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -23710,12 +24999,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -23723,12 +25015,15 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      nop_expr - arg
@@ -23745,22 +25040,28 @@ function_decl __uninitialized_move_if_noexcept_a /usr/include/c++/5/bits/stl_uni
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
             record_type - value
              type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23795,22 +25096,28 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23832,12 +25139,15 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
      type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -23860,22 +25170,28 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23899,12 +25215,15 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
    type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/ext/alloc_traits.h 192:7 - code
@@ -23929,22 +25248,28 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
            record_type - value
             type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -23968,12 +25293,15 @@ function_decl destroy /usr/include/c++/5/ext/alloc_traits.h 191:17
       type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
 function_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 740:7
@@ -24019,12 +25347,15 @@ function_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 740:7
      pointer_type - nested type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -24060,12 +25391,15 @@ function_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 740:7
    pointer_type - nested type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_iterator.h 741:27 - code
@@ -24106,12 +25440,15 @@ function_decl __normal_iterator /usr/include/c++/5/bits/stl_iterator.h 740:7
           pointer_type - nested type
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
          integer_cst 64 - parm size
   block - operand
@@ -24158,12 +25495,15 @@ function_decl __base_ctor  /usr/include/c++/5/bits/stl_iterator.h 740:7
      pointer_type - nested type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -24199,12 +25539,15 @@ function_decl __base_ctor  /usr/include/c++/5/bits/stl_iterator.h 740:7
    pointer_type - nested type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_iterator.h 741:27 - code
@@ -24245,12 +25588,15 @@ function_decl __base_ctor  /usr/include/c++/5/bits/stl_iterator.h 740:7
           pointer_type - nested type
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
          integer_cst 64 - parm size
   block - operand
@@ -24297,12 +25643,15 @@ function_decl __comp_ctor  /usr/include/c++/5/bits/stl_iterator.h 740:7
      pointer_type - nested type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -24338,12 +25687,15 @@ function_decl __comp_ctor  /usr/include/c++/5/bits/stl_iterator.h 740:7
    pointer_type - nested type
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
@@ -24362,22 +25714,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 113:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24405,22 +25763,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 113:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24458,22 +25822,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 113:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24515,22 +25885,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 113:7
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
              record_type - value
               type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24569,22 +25945,28 @@ function_decl allocator /usr/include/c++/5/bits/allocator.h 113:7
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
             record_type - value
              type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24618,22 +26000,28 @@ function_decl __base_ctor  /usr/include/c++/5/bits/allocator.h 113:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24661,22 +26049,28 @@ function_decl __base_ctor  /usr/include/c++/5/bits/allocator.h 113:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24714,22 +26108,28 @@ function_decl __base_ctor  /usr/include/c++/5/bits/allocator.h 113:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24771,22 +26171,28 @@ function_decl __base_ctor  /usr/include/c++/5/bits/allocator.h 113:7
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
              record_type - value
               type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24825,22 +26231,28 @@ function_decl __base_ctor  /usr/include/c++/5/bits/allocator.h 113:7
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
             record_type - value
              type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24874,22 +26286,28 @@ function_decl __comp_ctor  /usr/include/c++/5/bits/allocator.h 113:7
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       tree_vec - element
        pointer_type - element
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
      record_type - value
       type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24917,22 +26335,28 @@ function_decl __comp_ctor  /usr/include/c++/5/bits/allocator.h 113:7
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -24970,22 +26394,28 @@ function_decl __comp_ctor  /usr/include/c++/5/bits/allocator.h 113:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -25284,22 +26714,28 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -25321,12 +26757,15 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
      type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      integer_type - value
@@ -25356,22 +26795,28 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -25395,12 +26840,15 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
    type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -25434,22 +26882,28 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
             tree_vec - element
              pointer_type - element
               record_type - nested type
-               type_decl Data1 test22.cpp 3:8 - type name
+               type_decl Data1 test22.cpp 5:8 - type name
                - isAutogenerated: 1
-               field_decl val test22.cpp 5:9 - field
+               field_decl val test22.cpp 16:9 - field
                - signed
                 integer_cst 32 - decl size
-               type_decl Data1 test22.cpp 4:1 - field
+               field_decl ptrval test22.cpp 17:12 - field
+               - unsigned
+                integer_cst 64 - decl size
+               type_decl Data1 test22.cpp 6:1 - field
                - isAutogenerated: 1
            record_type - value
             type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -25473,12 +26927,15 @@ function_decl deallocate /usr/include/c++/5/ext/alloc_traits.h 184:17
       type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
     - isUsed: 1
@@ -25500,23 +26957,29 @@ function_decl __destroy /usr/include/c++/5/bits/stl_construct.h 112:9
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -25531,24 +26994,30 @@ function_decl __destroy /usr/include/c++/5/bits/stl_construct.h 112:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  parm_decl /usr/include/c++/5/bits/stl_construct.h 112:37 - argument
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  statement_list - code
@@ -25559,23 +27028,29 @@ function_decl __miter_base /usr/include/c++/5/bits/stl_algobase.h 293:5
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     void_type - value
@@ -25587,12 +27062,15 @@ function_decl __miter_base /usr/include/c++/5/bits/stl_algobase.h 293:5
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -25600,12 +27078,15 @@ function_decl __miter_base /usr/include/c++/5/bits/stl_algobase.h 293:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 294:55 - code
@@ -25617,12 +27098,15 @@ function_decl __miter_base /usr/include/c++/5/bits/stl_algobase.h 293:5
       type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 294:50 - operand
@@ -25636,12 +27120,15 @@ function_decl __miter_base /usr/include/c++/5/bits/stl_algobase.h 293:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607:5
@@ -25650,45 +27137,57 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -25699,12 +27198,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -25712,12 +27214,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -25725,12 +27230,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -25738,12 +27246,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 611:34 - code
@@ -25754,12 +27265,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 610:5 - operand
@@ -25779,12 +27293,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 610:51 - arg
@@ -25798,12 +27315,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 611:23 - arg
@@ -25817,12 +27337,15 @@ function_decl __copy_move_backward_a2 /usr/include/c++/5/bits/stl_algobase.h 607
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
 function_decl max_size /usr/include/c++/5/bits/stl_vector.h 659:7
@@ -26401,12 +27924,15 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
    type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    reference_type - value
@@ -26419,22 +27945,28 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -26468,12 +28000,15 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
    type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -26488,22 +28023,28 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -26539,12 +28080,15 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
       type_decl pointer /usr/include/c++/5/ext/alloc_traits.h 172:53 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     nop_expr - operand
@@ -26568,22 +28112,28 @@ function_decl allocate /usr/include/c++/5/ext/alloc_traits.h 181:5
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
               tree_vec - element
                pointer_type - element
                 record_type - nested type
-                 type_decl Data1 test22.cpp 3:8 - type name
+                 type_decl Data1 test22.cpp 5:8 - type name
                  - isAutogenerated: 1
-                 field_decl val test22.cpp 5:9 - field
+                 field_decl val test22.cpp 16:9 - field
                  - signed
                   integer_cst 32 - decl size
-                 type_decl Data1 test22.cpp 4:1 - field
+                 field_decl ptrval test22.cpp 17:12 - field
+                 - unsigned
+                  integer_cst 64 - decl size
+                 type_decl Data1 test22.cpp 6:1 - field
                  - isAutogenerated: 1
              record_type - value
               type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -26617,45 +28167,57 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       reference_type - value
@@ -26668,22 +28230,28 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
            tree_vec - element
             pointer_type - element
              record_type - nested type
-              type_decl Data1 test22.cpp 3:8 - type name
+              type_decl Data1 test22.cpp 5:8 - type name
               - isAutogenerated: 1
-              field_decl val test22.cpp 5:9 - field
+              field_decl val test22.cpp 16:9 - field
               - signed
                integer_cst 32 - decl size
-              type_decl Data1 test22.cpp 4:1 - field
+              field_decl ptrval test22.cpp 17:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Data1 test22.cpp 6:1 - field
               - isAutogenerated: 1
            tree_vec - element
             pointer_type - element
              record_type - nested type
-              type_decl Data1 test22.cpp 3:8 - type name
+              type_decl Data1 test22.cpp 5:8 - type name
               - isAutogenerated: 1
-              field_decl val test22.cpp 5:9 - field
+              field_decl val test22.cpp 16:9 - field
               - signed
                integer_cst 32 - decl size
-              type_decl Data1 test22.cpp 4:1 - field
+              field_decl ptrval test22.cpp 17:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Data1 test22.cpp 6:1 - field
               - isAutogenerated: 1
           record_type - value
            type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -26709,12 +28277,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -26722,12 +28293,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -26735,12 +28309,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -26748,12 +28325,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  parm_decl /usr/include/c++/5/bits/stl_uninitialized.h 280:48 - argument
@@ -26767,22 +28347,28 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -26808,12 +28394,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_uninitialized.h 281:37 - operand
@@ -26827,12 +28416,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -26840,12 +28432,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -26853,12 +28448,15 @@ function_decl __uninitialized_copy_a /usr/include/c++/5/bits/stl_uninitialized.h
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl destroy /usr/include/c++/5/ext/new_allocator.h 133:7
@@ -26900,12 +28498,15 @@ function_decl destroy /usr/include/c++/5/ext/new_allocator.h 133:7
      type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      void_type - value
@@ -26939,12 +28540,15 @@ function_decl destroy /usr/include/c++/5/ext/new_allocator.h 133:7
    type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/ext/new_allocator.h 133:30 - code
@@ -26957,12 +28561,15 @@ function_decl destroy /usr/include/c++/5/ext/new_allocator.h 133:7
        type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl new_allocator /usr/include/c++/5/ext/new_allocator.h 79:7
@@ -27193,12 +28800,15 @@ function_decl deallocate /usr/include/c++/5/ext/new_allocator.h 109:7
      type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      integer_type - value
@@ -27239,12 +28849,15 @@ function_decl deallocate /usr/include/c++/5/ext/new_allocator.h 109:7
    type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  parm_decl /usr/include/c++/5/ext/new_allocator.h 109:31 - argument
@@ -27272,12 +28885,15 @@ function_decl deallocate /usr/include/c++/5/ext/new_allocator.h 109:7
        type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
@@ -27287,23 +28903,29 @@ function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     void_type - value
@@ -27315,12 +28937,15 @@ function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -27328,12 +28953,15 @@ function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  return_expr /usr/include/c++/5/bits/stl_iterator_base_types.h 216:16 - code
@@ -27344,12 +28972,15 @@ function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
      type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     integer_cst 64 - decl size
    nop_expr - operand
@@ -27358,12 +28989,15 @@ function_decl _S_base /usr/include/c++/5/bits/stl_iterator_base_types.h 215:28
      pointer_type - decl type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - parm size
 function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
@@ -27373,23 +29007,29 @@ function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     void_type - value
@@ -27401,12 +29041,15 @@ function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
    type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -27414,12 +29057,15 @@ function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 283:55 - code
@@ -27431,12 +29077,15 @@ function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
       type_decl iterator_type /usr/include/c++/5/bits/stl_iterator_base_types.h 214:25 - type name
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 283:50 - operand
@@ -27449,12 +29098,15 @@ function_decl __niter_base /usr/include/c++/5/bits/stl_algobase.h 282:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:5
@@ -27463,45 +29115,57 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -27512,12 +29176,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -27525,12 +29192,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -27538,12 +29208,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -27551,12 +29224,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_algobase.h 602:19 - code
@@ -27579,12 +29255,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
        pointer_type - result type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - decl size
       call_expr /usr/include/c++/5/bits/stl_algobase.h 600:58 - operand
@@ -27599,12 +29278,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
          pointer_type - decl type
           pointer_type - nested type
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
        nop_expr - arg
@@ -27613,12 +29295,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
          pointer_type - decl type
           pointer_type - nested type
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
        - isUsed: 1
@@ -27626,12 +29311,15 @@ function_decl __copy_move_backward_a /usr/include/c++/5/bits/stl_algobase.h 589:
         pointer_type - decl type
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
   block - operand
@@ -27660,22 +29348,28 @@ function_decl max_size /usr/include/c++/5/ext/alloc_traits.h 194:22
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         tree_vec - element
          pointer_type - element
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
        record_type - value
         type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -27717,22 +29411,28 @@ function_decl max_size /usr/include/c++/5/ext/alloc_traits.h 194:22
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -27782,22 +29482,28 @@ function_decl max_size /usr/include/c++/5/ext/alloc_traits.h 194:22
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
              tree_vec - element
               pointer_type - element
                record_type - nested type
-                type_decl Data1 test22.cpp 3:8 - type name
+                type_decl Data1 test22.cpp 5:8 - type name
                 - isAutogenerated: 1
-                field_decl val test22.cpp 5:9 - field
+                field_decl val test22.cpp 16:9 - field
                 - signed
                  integer_cst 32 - decl size
-                type_decl Data1 test22.cpp 4:1 - field
+                field_decl ptrval test22.cpp 17:12 - field
+                - unsigned
+                 integer_cst 64 - decl size
+                type_decl Data1 test22.cpp 6:1 - field
                 - isAutogenerated: 1
             record_type - value
              type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -27827,22 +29533,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 117:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -27902,22 +29614,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 117:7
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        tree_vec - element
         pointer_type - element
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
       record_type - value
        type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -27966,22 +29684,28 @@ function_decl _M_get_Tp_allocator /usr/include/c++/5/bits/stl_vector.h 117:7
          tree_vec - element
           pointer_type - element
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          tree_vec - element
           pointer_type - element
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
         record_type - value
          type_decl rebind /usr/include/c++/5/bits/allocator.h 104:16 - type name
@@ -28034,12 +29758,15 @@ function_decl allocate /usr/include/c++/5/ext/new_allocator.h 99:7
    type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   record_type - method base type
    type_decl new_allocator /usr/include/c++/5/ext/new_allocator.h 58:11 - type name
@@ -28092,12 +29819,15 @@ function_decl allocate /usr/include/c++/5/ext/new_allocator.h 99:7
    type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -28189,12 +29919,15 @@ function_decl allocate /usr/include/c++/5/ext/new_allocator.h 99:7
        type_decl pointer /usr/include/c++/5/ext/new_allocator.h 63:26 - type name
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - decl size
      nop_expr - operand
@@ -28225,45 +29958,57 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -28274,12 +30019,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -28287,12 +30035,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28300,12 +30051,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28313,12 +30067,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_uninitialized.h 126:42 - code
@@ -28341,12 +30098,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
        pointer_type - result type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - decl size
       call_expr /usr/include/c++/5/bits/stl_uninitialized.h 126:15 - operand
@@ -28360,12 +30120,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
         pointer_type - decl type
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
        - isUsed: 1
@@ -28373,12 +30136,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
         pointer_type - decl type
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
        - isUsed: 1
@@ -28386,12 +30152,15 @@ function_decl uninitialized_copy /usr/include/c++/5/bits/stl_uninitialized.h 107
         pointer_type - decl type
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
   block - operand
@@ -28405,45 +30174,57 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -28454,12 +30235,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -28467,12 +30251,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28480,12 +30267,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28493,12 +30283,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_algobase.h 583:26 - code
@@ -28513,12 +30306,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      convert_expr - operand
@@ -28527,12 +30323,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
     integer_cst 8 - operand
@@ -28574,12 +30373,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
            pointer_type - decl type
             pointer_type - nested type
              record_type - nested type
-              type_decl Data1 test22.cpp 3:8 - type name
+              type_decl Data1 test22.cpp 5:8 - type name
               - isAutogenerated: 1
-              field_decl val test22.cpp 5:9 - field
+              field_decl val test22.cpp 16:9 - field
               - signed
                integer_cst 32 - decl size
-              type_decl Data1 test22.cpp 4:1 - field
+              field_decl ptrval test22.cpp 17:12 - field
+              - unsigned
+               integer_cst 64 - decl size
+              type_decl Data1 test22.cpp 6:1 - field
               - isAutogenerated: 1
            integer_cst 64 - parm size
           negate_expr /usr/include/c++/5/bits/stl_algobase.h 582:33 - operand
@@ -28595,12 +30397,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
           pointer_type - decl type
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
           integer_cst 64 - parm size
         mult_expr - arg
@@ -28617,12 +30422,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
       pointer_type - result type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - decl size
      pointer_plus_expr /usr/include/c++/5/bits/stl_algobase.h 583:20 - operand
@@ -28631,12 +30439,15 @@ function_decl __copy_move_b /usr/include/c++/5/bits/stl_algobase.h 573:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
       negate_expr /usr/include/c++/5/bits/stl_algobase.h 583:20 - operand
@@ -28738,45 +30549,57 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -28787,12 +30610,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -28800,12 +30626,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28813,12 +30642,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28826,12 +30658,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_uninitialized.h 93:53 - code
@@ -28842,12 +30677,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_uninitialized.h 93:27 - operand
@@ -28861,12 +30699,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -28874,12 +30715,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
      - isUsed: 1
@@ -28887,12 +30731,15 @@ function_decl __uninit_copy /usr/include/c++/5/bits/stl_uninitialized.h 91:9
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
@@ -28901,45 +30748,57 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -28950,12 +30809,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -28963,12 +30825,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28976,12 +30841,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -28989,12 +30857,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 470:18 - code
@@ -29005,12 +30876,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 469:8 - operand
@@ -29029,12 +30903,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 469:54 - arg
@@ -29047,12 +30924,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      - isUsed: 1
@@ -29060,12 +30940,15 @@ function_decl copy /usr/include/c++/5/bits/stl_algobase.h 460:5
       pointer_type - decl type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - parm size
 function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
@@ -29074,45 +30957,57 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -29123,12 +31018,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -29136,12 +31034,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29149,12 +31050,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29162,12 +31066,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/include/c++/5/bits/stl_algobase.h 438:39 - code
@@ -29178,12 +31085,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
      pointer_type - result type
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      integer_cst 64 - decl size
     call_expr /usr/include/c++/5/bits/stl_algobase.h 436:45 - operand
@@ -29202,12 +31112,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 437:28 - arg
@@ -29220,12 +31133,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      call_expr /usr/include/c++/5/bits/stl_algobase.h 438:28 - arg
@@ -29238,12 +31154,15 @@ function_decl __copy_move_a2 /usr/include/c++/5/bits/stl_algobase.h 434:5
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
 function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
@@ -29252,45 +31171,57 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -29301,12 +31232,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -29314,12 +31248,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29327,12 +31264,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29340,12 +31280,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_algobase.h 400:71 - code
@@ -29368,12 +31311,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
        pointer_type - result type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - decl size
       call_expr /usr/include/c++/5/bits/stl_algobase.h 400:44 - operand
@@ -29388,12 +31334,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
          pointer_type - decl type
           pointer_type - nested type
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
        nop_expr - arg
@@ -29402,12 +31351,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
          pointer_type - decl type
           pointer_type - nested type
            record_type - nested type
-            type_decl Data1 test22.cpp 3:8 - type name
+            type_decl Data1 test22.cpp 5:8 - type name
             - isAutogenerated: 1
-            field_decl val test22.cpp 5:9 - field
+            field_decl val test22.cpp 16:9 - field
             - signed
              integer_cst 32 - decl size
-            type_decl Data1 test22.cpp 4:1 - field
+            field_decl ptrval test22.cpp 17:12 - field
+            - unsigned
+             integer_cst 64 - decl size
+            type_decl Data1 test22.cpp 6:1 - field
             - isAutogenerated: 1
          integer_cst 64 - parm size
        - isUsed: 1
@@ -29415,12 +31367,15 @@ function_decl __copy_move_a /usr/include/c++/5/bits/stl_algobase.h 389:5
         pointer_type - decl type
          pointer_type - nested type
           record_type - nested type
-           type_decl Data1 test22.cpp 3:8 - type name
+           type_decl Data1 test22.cpp 5:8 - type name
            - isAutogenerated: 1
-           field_decl val test22.cpp 5:9 - field
+           field_decl val test22.cpp 16:9 - field
            - signed
             integer_cst 32 - decl size
-           type_decl Data1 test22.cpp 4:1 - field
+           field_decl ptrval test22.cpp 17:12 - field
+           - unsigned
+            integer_cst 64 - decl size
+           type_decl Data1 test22.cpp 6:1 - field
            - isAutogenerated: 1
         integer_cst 64 - parm size
   block - operand
@@ -29435,45 +31390,57 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
   pointer_type - function return type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   tree_list - arg types
    pointer_type - value
     pointer_type - nested type
      record_type - nested type
-      type_decl Data1 test22.cpp 3:8 - type name
+      type_decl Data1 test22.cpp 5:8 - type name
       - isAutogenerated: 1
-      field_decl val test22.cpp 5:9 - field
+      field_decl val test22.cpp 16:9 - field
       - signed
        integer_cst 32 - decl size
-      type_decl Data1 test22.cpp 4:1 - field
+      field_decl ptrval test22.cpp 17:12 - field
+      - unsigned
+       integer_cst 64 - decl size
+      type_decl Data1 test22.cpp 6:1 - field
       - isAutogenerated: 1
    tree_list - chain
     pointer_type - value
      pointer_type - nested type
       record_type - nested type
-       type_decl Data1 test22.cpp 3:8 - type name
+       type_decl Data1 test22.cpp 5:8 - type name
        - isAutogenerated: 1
-       field_decl val test22.cpp 5:9 - field
+       field_decl val test22.cpp 16:9 - field
        - signed
         integer_cst 32 - decl size
-       type_decl Data1 test22.cpp 4:1 - field
+       field_decl ptrval test22.cpp 17:12 - field
+       - unsigned
+        integer_cst 64 - decl size
+       type_decl Data1 test22.cpp 6:1 - field
        - isAutogenerated: 1
     tree_list - chain
      pointer_type - value
       pointer_type - nested type
        record_type - nested type
-        type_decl Data1 test22.cpp 3:8 - type name
+        type_decl Data1 test22.cpp 5:8 - type name
         - isAutogenerated: 1
-        field_decl val test22.cpp 5:9 - field
+        field_decl val test22.cpp 16:9 - field
         - signed
          integer_cst 32 - decl size
-        type_decl Data1 test22.cpp 4:1 - field
+        field_decl ptrval test22.cpp 17:12 - field
+        - unsigned
+         integer_cst 64 - decl size
+        type_decl Data1 test22.cpp 6:1 - field
         - isAutogenerated: 1
      tree_list - chain
       void_type - value
@@ -29484,12 +31451,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
   pointer_type - result type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - decl size
  - isUsed: 1
@@ -29497,12 +31467,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29510,12 +31483,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  - isUsed: 1
@@ -29523,12 +31499,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
   pointer_type - decl type
    pointer_type - nested type
     record_type - nested type
-     type_decl Data1 test22.cpp 3:8 - type name
+     type_decl Data1 test22.cpp 5:8 - type name
      - isAutogenerated: 1
-     field_decl val test22.cpp 5:9 - field
+     field_decl val test22.cpp 16:9 - field
      - signed
       integer_cst 32 - decl size
-     type_decl Data1 test22.cpp 4:1 - field
+     field_decl ptrval test22.cpp 17:12 - field
+     - unsigned
+      integer_cst 64 - decl size
+     type_decl Data1 test22.cpp 6:1 - field
      - isAutogenerated: 1
   integer_cst 64 - parm size
  bind_expr /usr/include/c++/5/bits/stl_algobase.h 383:26 - code
@@ -29543,12 +31522,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
      convert_expr - operand
@@ -29557,12 +31539,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
     integer_cst 8 - operand
@@ -29603,12 +31588,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
           pointer_type - decl type
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
           integer_cst 64 - parm size
         nop_expr - arg
@@ -29617,12 +31605,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
           pointer_type - decl type
            pointer_type - nested type
             record_type - nested type
-             type_decl Data1 test22.cpp 3:8 - type name
+             type_decl Data1 test22.cpp 5:8 - type name
              - isAutogenerated: 1
-             field_decl val test22.cpp 5:9 - field
+             field_decl val test22.cpp 16:9 - field
              - signed
               integer_cst 32 - decl size
-             type_decl Data1 test22.cpp 4:1 - field
+             field_decl ptrval test22.cpp 17:12 - field
+             - unsigned
+              integer_cst 64 - decl size
+             type_decl Data1 test22.cpp 6:1 - field
              - isAutogenerated: 1
           integer_cst 64 - parm size
         mult_expr - arg
@@ -29639,12 +31630,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
       pointer_type - result type
        pointer_type - nested type
         record_type - nested type
-         type_decl Data1 test22.cpp 3:8 - type name
+         type_decl Data1 test22.cpp 5:8 - type name
          - isAutogenerated: 1
-         field_decl val test22.cpp 5:9 - field
+         field_decl val test22.cpp 16:9 - field
          - signed
           integer_cst 32 - decl size
-         type_decl Data1 test22.cpp 4:1 - field
+         field_decl ptrval test22.cpp 17:12 - field
+         - unsigned
+          integer_cst 64 - decl size
+         type_decl Data1 test22.cpp 6:1 - field
          - isAutogenerated: 1
       integer_cst 64 - decl size
      pointer_plus_expr /usr/include/c++/5/bits/stl_algobase.h 383:20 - operand
@@ -29653,12 +31647,15 @@ function_decl __copy_m /usr/include/c++/5/bits/stl_algobase.h 373:9
        pointer_type - decl type
         pointer_type - nested type
          record_type - nested type
-          type_decl Data1 test22.cpp 3:8 - type name
+          type_decl Data1 test22.cpp 5:8 - type name
           - isAutogenerated: 1
-          field_decl val test22.cpp 5:9 - field
+          field_decl val test22.cpp 16:9 - field
           - signed
            integer_cst 32 - decl size
-          type_decl Data1 test22.cpp 4:1 - field
+          field_decl ptrval test22.cpp 17:12 - field
+          - unsigned
+           integer_cst 64 - decl size
+          type_decl Data1 test22.cpp 6:1 - field
           - isAutogenerated: 1
        integer_cst 64 - parm size
       nop_expr - operand
diff --git a/test/test22-02.txt b/test/test22-02.txt
index b5a6004..81348be 100644
--- a/test/test22-02.txt
+++ b/test/test22-02.txt
@@ -100,15 +100,26 @@ operator[]:
 operator+: 
 __fill_bvector: 
 fill: 
-ftest: 
+Data1: 
+__base_ctor : 
+__comp_ctor : 
+Data1: pointer_type ptr0, 
+__base_ctor : pointer_type ptr0, 
+__comp_ctor : pointer_type ptr0, 
+ftest1: 
+ftest2: pointer_type ptr0, 
 func1: pointer_type ptr1, 
 func2: pointer_type ptr1, 
 func3: pointer_type ptr1, 
 func4: pointer_type ptr1, 
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:36:24: warning: Using parameter 'ptr1' without checking for null pointer
-         if (ptr1->ftest() == 100)
-                        ^
+test22.cpp:53:25: warning: Using parameter 'ptr1' without checking for null pointer
+         if (ptr1->ftest1() == 100)
+                         ^
+func5: pointer_type ptr1, 
+__comp_ctor : 
+func6: pointer_type ptr1, 
+func7: pointer_type ptr1, 
 fill: pointer_type __first, pointer_type __last, 
 vector: 
 __base_ctor : 
diff --git a/test/test22-03.txt b/test/test22-03.txt
index f9825a5..9cf7d2b 100644
--- a/test/test22-03.txt
+++ b/test/test22-03.txt
@@ -528,37 +528,87 @@ function_decl operator[]:
 function_decl operator+: 
 function_decl __fill_bvector: 
 function_decl fill: 
-function_decl ftest: 
+function_decl Data1: 
+function_decl __base_ctor : 
+function_decl __comp_ctor : 
+function_decl Data1: 
+bind_expr : ptr0, 
+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, 
+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, 
+type_decl Data1: ptr0, 
+integer_cst 64: ptr0, 
+block : ptr0, 
+function_decl __base_ctor : 
+bind_expr : ptr0, 
+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, 
+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, 
+type_decl Data1: ptr0, 
+integer_cst 64: ptr0, 
+block : ptr0, 
+function_decl __comp_ctor : 
+statement_list : ptr0, 
+function_decl ftest1: 
+function_decl ftest2: 
+return_expr : ptr0, 
+init_expr : ptr0, 
+result_decl : ptr0, 
+integer_type : ptr0, 
+type_decl int: ptr0, 
+integer_cst 32: ptr0, 
+integer_cst -2147483648: ptr0, 
+integer_cst 2147483647: ptr0, 
+integer_cst 32: ptr0, 
+integer_cst 1: ptr0, 
 function_decl func1: 
 bind_expr : ptr1, 
-var_decl vec1: ptr1, 
-integer_cst 192: ptr1, 
-record_type : ptr1, 
-type_decl vector: ptr1, 
-field_decl : ptr1, 
-integer_cst 192: ptr1, 
-using_decl _M_allocate: ptr1, 
-using_decl _M_deallocate: ptr1, 
-using_decl _M_impl: ptr1, 
-using_decl _M_get_Tp_allocator: ptr1, 
-using_decl get_allocator: ptr1, 
-type_decl vector: ptr1, 
-type_decl _Alloc_value_type: ptr1, 
-type_decl _Base: ptr1, 
-type_decl _Tp_alloc_type: ptr1, 
-type_decl _Alloc_traits: ptr1, 
-type_decl value_type: ptr1, 
-type_decl pointer: ptr1, 
-type_decl const_pointer: ptr1, 
-type_decl reference: ptr1, 
-type_decl const_reference: ptr1, 
-type_decl iterator: ptr1, 
-type_decl const_iterator: ptr1, 
-type_decl const_reverse_iterator: ptr1, 
-type_decl reverse_iterator: ptr1, 
-type_decl size_type: ptr1, 
-type_decl difference_type: ptr1, 
-type_decl allocator_type: ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
 var_decl vec1: ptr1, 
@@ -585,6 +635,8 @@ record_type : ptr1,
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 64: ptr1, 
 call_expr : ptr1, 
@@ -593,15 +645,45 @@ function_decl __comp_dtor : ptr1,
 addr_expr : ptr1, 
 var_decl vec1: ptr1, 
 var_decl vec1: ptr1, 
+var_decl vec1: ptr1, 
+integer_cst 192: ptr1, 
+record_type : ptr1, 
+type_decl vector: ptr1, 
+field_decl : ptr1, 
+integer_cst 192: ptr1, 
+using_decl _M_allocate: ptr1, 
+using_decl _M_deallocate: ptr1, 
+using_decl _M_impl: ptr1, 
+using_decl _M_get_Tp_allocator: ptr1, 
+using_decl get_allocator: ptr1, 
+type_decl vector: ptr1, 
+type_decl _Alloc_value_type: ptr1, 
+type_decl _Base: ptr1, 
+type_decl _Tp_alloc_type: ptr1, 
+type_decl _Alloc_traits: ptr1, 
+type_decl value_type: ptr1, 
+type_decl pointer: ptr1, 
+type_decl const_pointer: ptr1, 
+type_decl reference: ptr1, 
+type_decl const_reference: ptr1, 
+type_decl iterator: ptr1, 
+type_decl const_iterator: ptr1, 
+type_decl const_reverse_iterator: ptr1, 
+type_decl reverse_iterator: ptr1, 
+type_decl size_type: ptr1, 
+type_decl difference_type: ptr1, 
+type_decl allocator_type: ptr1, 
 block : ptr1, 
 var_decl vec1: ptr1, 
 function_decl func2: 
 bind_expr : ptr1, 
+decl_expr : ptr1, 
+var_decl ptr2: ptr1, 
 var_decl ptr2: ptr1, 
 integer_cst 64: ptr1, 
 pointer_plus_expr : ptr1, 
 test22.cpp: In member function 'int Object1::func2(Data1*)':
-test22.cpp:25:28: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:42:28: warning: Using parameter 'ptr1' without checking for null pointer
          Data1* ptr2 = ptr1 + 1;
                             ^
 parm_decl ptr1: ptr1, 
@@ -610,26 +692,42 @@ record_type : ptr1,
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 64: ptr1, 
-integer_cst 4: ptr1, 
+integer_cst 16: ptr1, 
 pointer_type : ptr1, 
 record_type : ptr1, 
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
-decl_expr : ptr1, 
-var_decl ptr2: ptr1, 
 block : ptr1, 
 var_decl ptr2: ptr1, 
 function_decl func3: 
 bind_expr : ptr1, 
+statement_list : ptr1, 
+decl_expr : ptr1, 
+var_decl ptr2: ptr1, 
+cleanup_point_expr : ptr1, 
+expr_stmt : ptr1, 
+convert_expr : ptr1, 
+modify_expr : ptr1, 
+component_ref : ptr1, 
+indirect_ref : ptr1, 
+indirect_ref : ptr1, 
+var_decl ptr2: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+integer_cst 10: ptr1, 
 var_decl ptr2: ptr1, 
 integer_cst 64: ptr1, 
 addr_expr : ptr1, 
 test22.cpp: In member function 'int Object1::func3(Data1*)':
-test22.cpp:30:17: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:47:17: warning: Using parameter 'ptr1' without checking for null pointer
          Data1** ptr2 = &ptr1;
                  ^
 parm_decl ptr1: ptr1, 
@@ -638,6 +736,8 @@ record_type : ptr1,
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 64: ptr1, 
 pointer_type : ptr1, 
@@ -646,43 +746,127 @@ record_type : ptr1,
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+block : ptr1, 
+var_decl ptr2: ptr1, 
+function_decl func4: 
+if_stmt : ptr1, 
+cleanup_point_expr : ptr1, 
+eq_expr : ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl ftest1: ptr1, 
+test22.cpp: In member function 'void Object1::func4(Data1*)':
+test22.cpp:53:25: warning: Using parameter 'ptr1' without checking for null pointer
+         if (ptr1->ftest1() == 100)
+                         ^
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 100: ptr1, 
+return_expr : ptr1, 
+function_decl func5: 
+bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
-var_decl ptr2: ptr1, 
+var_decl data: ptr1, 
 cleanup_point_expr : ptr1, 
 expr_stmt : ptr1, 
-convert_expr : ptr1, 
-modify_expr : ptr1, 
-component_ref : ptr1, 
-indirect_ref : ptr1, 
-indirect_ref : ptr1, 
-var_decl ptr2: ptr1, 
+call_expr : ptr1, 
+addr_expr : ptr1, 
+function_decl __comp_ctor : ptr1, 
+addr_expr : ptr1, 
+var_decl data: ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
-integer_cst 10: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+var_decl data: ptr1, 
+integer_cst 128: ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
 block : ptr1, 
-var_decl ptr2: ptr1, 
-function_decl func4: 
+var_decl data: ptr1, 
+function_decl func6: 
+bind_expr : ptr1, 
+statement_list : ptr1, 
+if_stmt : ptr1, 
+eq_expr : ptr1, 
+parm_decl ptr1: ptr1, 
+pointer_type : ptr1, 
+record_type : ptr1, 
+type_decl Data1: ptr1, 
+field_decl val: ptr1, 
+integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
+type_decl Data1: ptr1, 
+integer_cst 64: ptr1, 
+integer_cst 0: ptr1, 
+return_expr : ptr1, 
+decl_expr : ptr1, 
+var_decl num: 
+var_decl num: ptr1, 
+integer_cst 32: 
+component_ref : 
+indirect_ref : 
+parm_decl ptr1: 
+pointer_type : 
+record_type : 
+type_decl Data1: 
+field_decl val: 
+integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
+type_decl Data1: 
+integer_cst 64: 
+field_decl val: 
+integer_cst 32: 
+integer_type : 
+type_decl int: 
+integer_cst 32: 
+integer_cst -2147483648: 
+integer_cst 2147483647: 
+block : ptr1, 
+var_decl num: 
+function_decl func7: 
 if_stmt : ptr1, 
 cleanup_point_expr : ptr1, 
 eq_expr : ptr1, 
 call_expr : ptr1, 
 addr_expr : ptr1, 
-function_decl ftest: ptr1, 
-test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:36:24: warning: Using parameter 'ptr1' without checking for null pointer
-         if (ptr1->ftest() == 100)
-                        ^
+function_decl ftest2: ptr1, 
 parm_decl ptr1: ptr1, 
 pointer_type : ptr1, 
 record_type : ptr1, 
 type_decl Data1: ptr1, 
 field_decl val: ptr1, 
 integer_cst 32: ptr1, 
+field_decl ptrval: ptr1, 
+integer_cst 64: ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 64: ptr1, 
-integer_cst 100: ptr1, 
+integer_cst 200: ptr1, 
 return_expr : ptr1, 
 function_decl fill: 
 cleanup_point_expr : __first, __last, 
@@ -754,22 +938,6 @@ integer_cst : __it,
 integer_cst 64: __it, 
 function_decl __fill_a: 
 bind_expr : __first, __last, 
-var_decl __tmp: __first, __last, 
-integer_cst 32: __first, __last, 
-indirect_ref : __first, __last, 
-parm_decl __value: __first, __last, 
-reference_type : __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
-integer_cst 64: __first, __last, 
-integer_type : __first, __last, 
-type_decl int: __first, __last, 
-integer_cst 32: __first, __last, 
-integer_cst -2147483648: __first, __last, 
-integer_cst 2147483647: __first, __last, 
 statement_list : __first, __last, 
 decl_expr : __first, __last, 
 var_decl __tmp: __first, __last, 
@@ -817,6 +985,22 @@ integer_cst 0: __first, __last,
 integer_cst : __first, __last, 
 integer_cst 64: __first, __last, 
 var_decl __tmp: __first, __last, 
+var_decl __tmp: __first, __last, 
+integer_cst 32: __first, __last, 
+indirect_ref : __first, __last, 
+parm_decl __value: __first, __last, 
+reference_type : __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
+integer_cst 64: __first, __last, 
+integer_type : __first, __last, 
+type_decl int: __first, __last, 
+integer_cst 32: __first, __last, 
+integer_cst -2147483648: __first, __last, 
+integer_cst 2147483647: __first, __last, 
 block : __first, __last, 
 var_decl __tmp: __first, __last, 
 function_decl _Vector_impl: 
@@ -842,6 +1026,8 @@ record_type : __first, __last,
 type_decl Data1: __first, __last, 
 field_decl val: __first, __last, 
 integer_cst 32: __first, __last, 
+field_decl ptrval: __first, __last, 
+integer_cst 64: __first, __last, 
 type_decl Data1: __first, __last, 
 integer_cst 64: __first, __last, 
 parm_decl __last: __first, __last, 
@@ -851,6 +1037,8 @@ record_type : __first, __last,
 type_decl Data1: __first, __last, 
 field_decl val: __first, __last, 
 integer_cst 32: __first, __last, 
+field_decl ptrval: __first, __last, 
+integer_cst 64: __first, __last, 
 type_decl Data1: __first, __last, 
 integer_cst 64: __first, __last, 
 function_decl construct: 
@@ -873,6 +1061,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 tree_vec : __p, 
 pointer_type : __p, 
@@ -880,6 +1070,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 record_type : __p, 
 type_decl rebind: __p, 
@@ -902,6 +1094,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 convert_expr : __p, 
@@ -912,6 +1106,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 function_decl _M_insert_aux: 
@@ -944,7 +1140,6 @@ function_decl __base_dtor :
 function_decl __comp_dtor : 
 function_decl _M_deallocate: 
 bind_expr : __p, 
-type_decl _Tr: __p, 
 if_stmt : __p, 
 ne_expr : __p, 
 parm_decl __p: __p, 
@@ -955,6 +1150,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 integer_cst 0: __p, 
@@ -988,6 +1185,8 @@ record_type :
 type_decl Data1: 
 field_decl val: 
 integer_cst 32: 
+field_decl ptrval: 
+integer_cst 64: 
 type_decl Data1: 
 integer_cst 64: 
 parm_decl __n: 
@@ -997,10 +1196,10 @@ integer_cst 64:
 integer_cst 0: 
 integer_cst : 
 integer_cst 64: 
+type_decl _Tr: __p, 
 block : __p, 
 function_decl _Destroy: 
 bind_expr : __first, __last, 
-type_decl _Value_type: __first, __last, 
 cleanup_point_expr : __first, __last, 
 expr_stmt : __first, __last, 
 call_expr : __first, __last, 
@@ -1013,6 +1212,8 @@ record_type : __first, __last,
 type_decl Data1: __first, __last, 
 field_decl val: __first, __last, 
 integer_cst 32: __first, __last, 
+field_decl ptrval: __first, __last, 
+integer_cst 64: __first, __last, 
 type_decl Data1: __first, __last, 
 integer_cst 64: __first, __last, 
 parm_decl __last: __first, __last, 
@@ -1022,8 +1223,11 @@ record_type : __first, __last,
 type_decl Data1: __first, __last, 
 field_decl val: __first, __last, 
 integer_cst 32: __first, __last, 
+field_decl ptrval: __first, __last, 
+integer_cst 64: __first, __last, 
 type_decl Data1: __first, __last, 
 integer_cst 64: __first, __last, 
+type_decl _Value_type: __first, __last, 
 block : __first, __last, 
 function_decl construct: 
 cleanup_point_expr : __p, 
@@ -1045,6 +1249,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 target_expr : __p, 
@@ -1076,6 +1282,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 call_expr : __p, 
@@ -1098,6 +1306,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1113,6 +1323,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1125,6 +1337,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -1134,18 +1348,13 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl operator*: 
 function_decl _M_check_len: 
 bind_expr : __s, 
-var_decl __len: __s, 
-integer_cst 64: __s, 
-integer_type : __s, 
-type_decl size_type: __s, 
-integer_cst 64: __s, 
-integer_cst 0: __s, 
-integer_cst : __s, 
 statement_list : __s, 
 if_stmt : __s, 
 cleanup_point_expr : __s, 
@@ -1441,6 +1650,13 @@ type_decl difference_type: __s,
 type_decl allocator_type: __s, 
 integer_cst 64: __s, 
 var_decl __len: __s, 
+var_decl __len: __s, 
+integer_cst 64: __s, 
+integer_type : __s, 
+type_decl size_type: __s, 
+integer_cst 64: __s, 
+integer_cst 0: __s, 
+integer_cst : __s, 
 block : __s, 
 var_decl __len: __s, 
 function_decl begin: 
@@ -1457,6 +1673,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1469,6 +1687,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -1478,6 +1698,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -1487,6 +1709,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 convert_expr : __first, __last, __result, 
@@ -1503,6 +1727,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 tree_vec : __first, __last, __result, 
 pointer_type : __first, __last, __result, 
@@ -1510,6 +1736,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 record_type : __first, __last, __result, 
 type_decl rebind: __first, __last, __result, 
@@ -1544,6 +1772,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 tree_vec : __p, 
 pointer_type : __p, 
@@ -1551,6 +1781,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 record_type : __p, 
 type_decl rebind: __p, 
@@ -1573,6 +1805,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 function_decl __normal_iterator: 
@@ -1604,6 +1838,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 tree_vec : __p, 
 pointer_type : __p, 
@@ -1611,6 +1847,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 record_type : __p, 
 type_decl rebind: __p, 
@@ -1633,6 +1871,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 parm_decl __n: __p, 
@@ -1656,6 +1896,8 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 call_expr : __it, 
@@ -1668,6 +1910,8 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 function_decl __copy_move_backward_a2: 
@@ -1681,6 +1925,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1696,6 +1942,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1708,6 +1956,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1720,6 +1970,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl max_size: 
@@ -1737,6 +1989,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1749,6 +2003,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -1758,6 +2014,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -1767,6 +2025,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl destroy: 
@@ -1781,6 +2041,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 function_decl new_allocator: 
@@ -1800,6 +2062,8 @@ record_type : __p,
 type_decl Data1: __p, 
 field_decl val: __p, 
 integer_cst 32: __p, 
+field_decl ptrval: __p, 
+integer_cst 64: __p, 
 type_decl Data1: __p, 
 integer_cst 64: __p, 
 function_decl _S_base: 
@@ -1813,6 +2077,8 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 parm_decl __it: __it, 
@@ -1822,6 +2088,8 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 function_decl __niter_base: 
@@ -1836,6 +2104,8 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 call_expr : __it, 
@@ -1848,11 +2118,12 @@ record_type : __it,
 type_decl Data1: __it, 
 field_decl val: __it, 
 integer_cst 32: __it, 
+field_decl ptrval: __it, 
+integer_cst 64: __it, 
 type_decl Data1: __it, 
 integer_cst 64: __it, 
 function_decl __copy_move_backward_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -1871,6 +2142,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -1883,6 +2156,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -1892,6 +2167,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -1901,8 +2178,11 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl max_size: 
@@ -1952,6 +2232,8 @@ record_type : ,
 type_decl Data1: , 
 field_decl val: , 
 integer_cst 32: , 
+field_decl ptrval: , 
+integer_cst 64: , 
 type_decl Data1: , 
 integer_cst 64: , 
 call_expr : , 
@@ -1969,7 +2251,6 @@ integer_cst : ,
 integer_cst 64: , 
 function_decl uninitialized_copy: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueType1: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -1988,6 +2269,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2000,6 +2283,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -2009,6 +2294,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -2018,42 +2305,15 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueType1: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __assignable: __first, __last, __result, 
 function_decl __copy_move_b: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-field_decl val: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-field_decl val: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -2075,6 +2335,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 negate_expr : __first, __last, __result, 
@@ -2088,6 +2350,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 mult_expr : __first, __last, __result, 
@@ -2103,6 +2367,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 pointer_plus_expr : __first, __last, __result, 
@@ -2113,12 +2379,48 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 negate_expr : __first, __last, __result, 
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+field_decl val: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+field_decl val: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 function_decl max_size: 
@@ -2133,6 +2435,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2145,6 +2449,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -2154,6 +2460,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -2163,6 +2471,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl copy: 
@@ -2176,6 +2486,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2191,6 +2503,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2203,6 +2517,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -2212,6 +2528,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl __copy_move_a2: 
@@ -2225,6 +2543,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2240,6 +2560,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2252,6 +2574,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2264,11 +2588,12 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 function_decl __copy_move_a: 
 bind_expr : __first, __last, __result, 
-type_decl _ValueTypeI: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 cleanup_point_expr : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
@@ -2287,6 +2612,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 call_expr : __first, __last, __result, 
@@ -2299,6 +2626,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __last: __first, __last, __result, 
@@ -2308,6 +2637,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __result: __first, __last, __result, 
@@ -2317,42 +2648,15 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
+type_decl _ValueTypeI: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl __simple: __first, __last, __result, 
 function_decl __copy_m: 
 bind_expr : __first, __last, __result, 
-var_decl _Num: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-exact_div_expr : __first, __last, __result, 
-minus_expr : __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __last: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-field_decl val: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-convert_expr : __first, __last, __result, 
-parm_decl __first: __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-pointer_type : __first, __last, __result, 
-record_type : __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-field_decl val: __first, __last, __result, 
-integer_cst 32: __first, __last, __result, 
-type_decl Data1: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst 8: __first, __last, __result, 
-integer_type : __first, __last, __result, 
-type_decl ptrdiff_t: __first, __last, __result, 
-integer_cst 64: __first, __last, __result, 
-integer_cst -0: __first, __last, __result, 
-integer_cst 4294967295: __first, __last, __result, 
 statement_list : __first, __last, __result, 
 decl_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
@@ -2373,6 +2677,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 parm_decl __first: __first, __last, __result, 
@@ -2382,6 +2688,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 mult_expr : __first, __last, __result, 
@@ -2397,6 +2705,8 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 pointer_plus_expr : __first, __last, __result, 
@@ -2407,10 +2717,46 @@ record_type : __first, __last, __result,
 type_decl Data1: __first, __last, __result, 
 field_decl val: __first, __last, __result, 
 integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
 type_decl Data1: __first, __last, __result, 
 integer_cst 64: __first, __last, __result, 
 mult_expr : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
 integer_cst 8: __first, __last, __result, 
+var_decl _Num: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+exact_div_expr : __first, __last, __result, 
+minus_expr : __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __last: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+field_decl val: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+convert_expr : __first, __last, __result, 
+parm_decl __first: __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+pointer_type : __first, __last, __result, 
+record_type : __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+field_decl val: __first, __last, __result, 
+integer_cst 32: __first, __last, __result, 
+field_decl ptrval: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+type_decl Data1: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst 8: __first, __last, __result, 
+integer_type : __first, __last, __result, 
+type_decl ptrdiff_t: __first, __last, __result, 
+integer_cst 64: __first, __last, __result, 
+integer_cst -0: __first, __last, __result, 
+integer_cst 4294967295: __first, __last, __result, 
 block : __first, __last, __result, 
 var_decl _Num: __first, __last, __result, 
diff --git a/test/test22-04.txt b/test/test22-04.txt
index f590775..ef5718d 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:25:28: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:42: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:30:17: warning: Using parameter 'ptr1' without checking for null pointer
+test22.cpp:47:17: warning: Using parameter 'ptr1' without checking for null pointer
          Data1** ptr2 = &ptr1;
                  ^
 test22.cpp: In member function 'void Object1::func4(Data1*)':
-test22.cpp:36:24: warning: Using parameter 'ptr1' without checking for null pointer
-         if (ptr1->ftest() == 100)
-                        ^
+test22.cpp:53:25: warning: Using parameter 'ptr1' without checking for null pointer
+         if (ptr1->ftest1() == 100)
+                         ^
diff --git a/test/test22.cpp b/test/test22.cpp
index 5e81ae2..f818390 100644
--- a/test/test22.cpp
+++ b/test/test22.cpp
@@ -1,10 +1,27 @@
 #include <vector>
 
+struct Data1;
+
 struct Data1
 {
+    Data1()
+    {
+    }
+
+    Data1(Data1 *ptr0) :
+        ptrval(ptr0)
+    {
+    }
+
     int val;
+    Data1 *ptrval;
+
+    int ftest1()
+    {
+        return 1;
+    }
 
-    int ftest()
+    static int ftest2(Data1 *ptr0)
     {
         return 1;
     }
@@ -33,7 +50,27 @@ class Object1
 
     void func4(Data1 *const ptr1)
     {
-        if (ptr1->ftest() == 100)
+        if (ptr1->ftest1() == 100)
+        {
+            return;
+        }
+    }
+
+    void func5(Data1 *ptr1)
+    {
+        Data1 data(ptr1);
+    }
+
+    void func6(Data1 *const ptr1)
+    {
+        if (!ptr1)
+            return;
+        int num = ptr1->val;
+    }
+
+    void func7(Data1 *const ptr1)
+    {
+        if (Data1::ftest2(ptr1) == 200)
         {
             return;
         }