Update test 22. Update test results.

1 files changed, 484 insertions, 138 deletions

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,