Update test results.

2 files changed, 79 insertions, 121 deletions

diff --git a/test/test07-01.txt b/test/test07-01.txt
index 4b0a48c..271d352 100644
--- a/test/test07-01.txt
+++ b/test/test07-01.txt
@@ -29741,64 +29741,16 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
      block - operand
       var_decl __x_copy /usr/include/c++/5/bits/vector.tcc 337:8 - block vars
       - isUsed: 1
-      block - block chain
-       var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - block vars
-       - isUsed: 1
-        integer_cst 64 - decl size
-        integer_type - var type
-        - precisionBits: 64
-        - unsigned
-         type_decl size_type /usr/include/c++/5/bits/stl_vector.h 236:27 - type name
-         integer_cst 64 - type size
-         integer_cst 0 - min value
-       var_decl __elems_before /usr/include/c++/5/bits/vector.tcc 352:20 - block vars
-       - isUsed: 1
-        integer_cst 64 - decl size
-        integer_type - var type
-        - precisionBits: 64
-        - unsigned
-         type_decl size_type /usr/include/c++/5/bits/stl_vector.h 236:27 - type name
-         integer_cst 64 - type size
-         integer_cst 0 - min value
-       var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - block vars
-       - isUsed: 1
-        integer_cst 64 - decl size
-        pointer_type - var type
-         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 Struct1 test07.cpp 4:8 - type name
-           - isAutogenerated: 1
-           field_decl str test07.cpp 12:17 - field
-           - signed
-            integer_cst 64 - decl size
-           field_decl num test07.cpp 13:9 - field
-           - signed
-            integer_cst 32 - decl size
-           type_decl Struct1 test07.cpp 5:1 - field
-           - isAutogenerated: 1
-       var_decl __new_finish /usr/include/c++/5/bits/vector.tcc 354:12 - block vars
-       - isUsed: 1
-        integer_cst 64 - decl size
-        var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - initial
-        - isUsed: 1
-        pointer_type - var type
-         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 Struct1 test07.cpp 4:8 - type name
-           - isAutogenerated: 1
-           field_decl str test07.cpp 12:17 - field
-           - signed
-            integer_cst 64 - decl size
-           field_decl num test07.cpp 13:9 - field
-           - signed
-            integer_cst 32 - decl size
-           type_decl Struct1 test07.cpp 5:1 - field
-           - isAutogenerated: 1
     bind_expr /usr/include/c++/5/bits/vector.tcc 399:57 - else
      var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - operand
      - isUsed: 1
+      integer_cst 64 - decl size
+      integer_type - var type
+      - precisionBits: 64
+      - unsigned
+       type_decl size_type /usr/include/c++/5/bits/stl_vector.h 236:27 - type name
+       integer_cst 64 - type size
+       integer_cst 0 - min value
      statement_list - operand
       decl_expr /usr/include/c++/5/bits/vector.tcc 351:56 - statement
        var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - operand
@@ -29857,6 +29809,13 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
       decl_expr /usr/include/c++/5/bits/vector.tcc 352:56 - statement
        var_decl __elems_before /usr/include/c++/5/bits/vector.tcc 352:20 - operand
        - isUsed: 1
+        integer_cst 64 - decl size
+        integer_type - var type
+        - precisionBits: 64
+        - unsigned
+         type_decl size_type /usr/include/c++/5/bits/stl_vector.h 236:27 - type name
+         integer_cst 64 - type size
+         integer_cst 0 - min value
       cleanup_point_expr /usr/include/c++/5/bits/vector.tcc 352:56 - statement
        expr_stmt /usr/include/c++/5/bits/vector.tcc 352:56 - operand
         convert_expr - expresssion
@@ -29953,6 +29912,21 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
       decl_expr /usr/include/c++/5/bits/vector.tcc 353:48 - statement
        var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - operand
        - isUsed: 1
+        integer_cst 64 - decl size
+        pointer_type - var type
+         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 Struct1 test07.cpp 4:8 - type name
+           - isAutogenerated: 1
+           field_decl str test07.cpp 12:17 - field
+           - signed
+            integer_cst 64 - decl size
+           field_decl num test07.cpp 13:9 - field
+           - signed
+            integer_cst 32 - decl size
+           type_decl Struct1 test07.cpp 5: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
         convert_expr - expresssion
@@ -30013,6 +29987,23 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
       decl_expr /usr/include/c++/5/bits/vector.tcc 354:36 - statement
        var_decl __new_finish /usr/include/c++/5/bits/vector.tcc 354:12 - operand
        - isUsed: 1
+        integer_cst 64 - decl size
+        var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - initial
+        - isUsed: 1
+        pointer_type - var type
+         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 Struct1 test07.cpp 4:8 - type name
+           - isAutogenerated: 1
+           field_decl str test07.cpp 12:17 - field
+           - signed
+            integer_cst 64 - decl size
+           field_decl num test07.cpp 13:9 - field
+           - signed
+            integer_cst 32 - decl size
+           type_decl Struct1 test07.cpp 5:1 - field
+           - isAutogenerated: 1
       try_block /usr/include/c++/5/bits/vector.tcc 355:4 - statement
        statement_list - body
         cleanup_point_expr /usr/include/c++/5/bits/vector.tcc 361:8 - statement
@@ -31159,15 +31150,6 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
     block - sub block
      var_decl __x_copy /usr/include/c++/5/bits/vector.tcc 337:8 - block vars
      - isUsed: 1
-     block - block chain
-      var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - block vars
-      - isUsed: 1
-      var_decl __elems_before /usr/include/c++/5/bits/vector.tcc 352:20 - block vars
-      - isUsed: 1
-      var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - block vars
-      - isUsed: 1
-      var_decl __new_finish /usr/include/c++/5/bits/vector.tcc 354:12 - block vars
-      - isUsed: 1
     block - sub block
      var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - block vars
      - isUsed: 1
@@ -31182,15 +31164,6 @@ function_decl _M_insert_aux /usr/include/c++/5/bits/vector.tcc 326:5
     block - sub block
      var_decl __x_copy /usr/include/c++/5/bits/vector.tcc 337:8 - block vars
      - isUsed: 1
-     block - block chain
-      var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - block vars
-      - isUsed: 1
-      var_decl __elems_before /usr/include/c++/5/bits/vector.tcc 352:20 - block vars
-      - isUsed: 1
-      var_decl __new_start /usr/include/c++/5/bits/vector.tcc 353:12 - block vars
-      - isUsed: 1
-      var_decl __new_finish /usr/include/c++/5/bits/vector.tcc 354:12 - block vars
-      - isUsed: 1
     block - sub block
      var_decl __len /usr/include/c++/5/bits/vector.tcc 350:20 - block vars
      - isUsed: 1
diff --git a/test/test07-02.txt b/test/test07-02.txt
index a68367e..24cd420 100644
--- a/test/test07-02.txt
+++ b/test/test07-02.txt
@@ -21107,46 +21107,13 @@
 10 var_decl /usr/include/c++/5/bits/vector.tcc
 5 block 
 6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 block 
-7 var_decl /usr/include/c++/5/bits/vector.tcc
-8 integer_cst 
-8 integer_type 
-9 type_decl /usr/include/c++/5/bits/stl_vector.h
-9 integer_cst 
-9 integer_cst 
-7 var_decl /usr/include/c++/5/bits/vector.tcc
-8 integer_cst 
-8 integer_type 
-9 type_decl /usr/include/c++/5/bits/stl_vector.h
-9 integer_cst 
-9 integer_cst 
-7 var_decl /usr/include/c++/5/bits/vector.tcc
-8 integer_cst 
-8 pointer_type 
-9 type_decl /usr/include/c++/5/bits/stl_vector.h
-9 pointer_type 
-10 record_type 
-11 type_decl test07.cpp
-11 field_decl test07.cpp
-12 integer_cst 
-11 field_decl test07.cpp
-12 integer_cst 
-11 type_decl test07.cpp
-7 var_decl /usr/include/c++/5/bits/vector.tcc
-8 integer_cst 
-8 var_decl /usr/include/c++/5/bits/vector.tcc
-8 pointer_type 
-9 type_decl /usr/include/c++/5/bits/stl_vector.h
-9 pointer_type 
-10 record_type 
-11 type_decl test07.cpp
-11 field_decl test07.cpp
-12 integer_cst 
-11 field_decl test07.cpp
-12 integer_cst 
-11 type_decl test07.cpp
 4 bind_expr /usr/include/c++/5/bits/vector.tcc
 5 var_decl /usr/include/c++/5/bits/vector.tcc
+6 integer_cst 
+6 integer_type 
+7 type_decl /usr/include/c++/5/bits/stl_vector.h
+7 integer_cst 
+7 integer_cst 
 5 statement_list 
 6 decl_expr /usr/include/c++/5/bits/vector.tcc
 7 var_decl /usr/include/c++/5/bits/vector.tcc
@@ -21193,6 +21160,11 @@
 13 string_cst 
 6 decl_expr /usr/include/c++/5/bits/vector.tcc
 7 var_decl /usr/include/c++/5/bits/vector.tcc
+8 integer_cst 
+8 integer_type 
+9 type_decl /usr/include/c++/5/bits/stl_vector.h
+9 integer_cst 
+9 integer_cst 
 6 cleanup_point_expr /usr/include/c++/5/bits/vector.tcc
 7 expr_stmt /usr/include/c++/5/bits/vector.tcc
 8 convert_expr 
@@ -21271,6 +21243,17 @@
 18 integer_cst 
 6 decl_expr /usr/include/c++/5/bits/vector.tcc
 7 var_decl /usr/include/c++/5/bits/vector.tcc
+8 integer_cst 
+8 pointer_type 
+9 type_decl /usr/include/c++/5/bits/stl_vector.h
+9 pointer_type 
+10 record_type 
+11 type_decl test07.cpp
+11 field_decl test07.cpp
+12 integer_cst 
+11 field_decl test07.cpp
+12 integer_cst 
+11 type_decl test07.cpp
 6 cleanup_point_expr /usr/include/c++/5/bits/vector.tcc
 7 expr_stmt /usr/include/c++/5/bits/vector.tcc
 8 convert_expr 
@@ -21318,6 +21301,18 @@
 12 var_decl /usr/include/c++/5/bits/vector.tcc
 6 decl_expr /usr/include/c++/5/bits/vector.tcc
 7 var_decl /usr/include/c++/5/bits/vector.tcc
+8 integer_cst 
+8 var_decl /usr/include/c++/5/bits/vector.tcc
+8 pointer_type 
+9 type_decl /usr/include/c++/5/bits/stl_vector.h
+9 pointer_type 
+10 record_type 
+11 type_decl test07.cpp
+11 field_decl test07.cpp
+12 integer_cst 
+11 field_decl test07.cpp
+12 integer_cst 
+11 type_decl test07.cpp
 6 try_block /usr/include/c++/5/bits/vector.tcc
 7 statement_list 
 8 cleanup_point_expr /usr/include/c++/5/bits/vector.tcc
@@ -22223,11 +22218,6 @@
 3 block 
 4 block 
 5 var_decl /usr/include/c++/5/bits/vector.tcc
-5 block 
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
 4 block 
 5 var_decl /usr/include/c++/5/bits/vector.tcc
 5 var_decl /usr/include/c++/5/bits/vector.tcc
@@ -22237,11 +22227,6 @@
 3 block 
 4 block 
 5 var_decl /usr/include/c++/5/bits/vector.tcc
-5 block 
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
-6 var_decl /usr/include/c++/5/bits/vector.tcc
 4 block 
 5 var_decl /usr/include/c++/5/bits/vector.tcc
 5 var_decl /usr/include/c++/5/bits/vector.tcc