Update test results.

8 files changed, 123 insertions, 121 deletions

diff --git a/test/crashtest2-01.txt b/test/crashtest2-01.txt
index e7d8861..f83c9ad 100644
--- a/test/crashtest2-01.txt
+++ b/test/crashtest2-01.txt
@@ -21,7 +21,7 @@ function_decl _mm_empty /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 49:1
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 51:25 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 51:25 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 51:23 - expresssion
    - function: LOAD_LANES - expresssion
 function_decl _m_empty /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 55:1
@@ -47,7 +47,7 @@ function_decl _m_empty /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 55:1
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 57:15 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 57:15 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 57:13 - expresssion
    - function: LOAD_LANES - expresssion
 function_decl _mm_cvtsi32_si64 /usr/lib/gcc/x86_64-linux-gnu/5/include/mmintrin.h 62:1
@@ -19418,7 +19418,7 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - statement
     var_decl ptr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - operand
     - isUsed: 1
-   if_stmt - statement
+   if_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 41:3 - statement
     eq_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 41:17 - condition
      - isUsed: 1
      parm_decl alignment /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:33 - operand
@@ -19451,7 +19451,7 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
           integer_cst 64 - type size
           integer_cst 0 - min value
          integer_cst 64 - parm size
-   if_stmt - statement
+   if_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 43:3 - statement
     truth_orif_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 43:22 - condition
      eq_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 43:17 - operand
       - isUsed: 1
@@ -19482,7 +19482,7 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
         integer_cst 64 - parm size
        integer_cst 4 - operand
     cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 44:32 - then
-     expr_stmt - operand
+     expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 44:32 - operand
       convert_expr - expresssion
        modify_expr - operand
         - isUsed: 1
@@ -19497,7 +19497,7 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
         sizeof_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 44:24 - operand
          nop_expr - operand
           error_mark - operand
-   if_stmt - statement
+   if_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 45:3 - statement
     cleanup_point_expr - condition
      eq_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 45:46 - operand
       call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 45:22 - operand
@@ -19575,7 +19575,7 @@ function_decl _mm_free /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 52:1
     - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 54:13 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 54:13 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 54:8 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -28492,7 +28492,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
        type_decl float <built-in> 0:0 - type name
        - isAutogenerated: 1
    cleanup_point_expr crashtest2.h 651:61 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 651:61 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __sign crashtest2.h 644:10 - operand
@@ -28522,7 +28522,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
             integer_cst 2147483647 - max value
           integer_cst 64 - parm size
    cleanup_point_expr crashtest2.h 654:67 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 654:67 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __losi crashtest2.h 645:18 - operand
@@ -28550,7 +28550,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
          var_decl __sign crashtest2.h 644:10 - arg
          - isUsed: 1
    cleanup_point_expr crashtest2.h 655:67 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 655:67 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __hisi crashtest2.h 645:10 - operand
@@ -28578,7 +28578,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
          var_decl __sign crashtest2.h 644:10 - arg
          - isUsed: 1
    cleanup_point_expr crashtest2.h 658:38 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 658:38 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __zero crashtest2.h 646:10 - operand
@@ -28586,7 +28586,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
        call_expr crashtest2.h 658:36 - operand
        - function: LOAD_LANES - operand
    cleanup_point_expr crashtest2.h 659:50 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 659:50 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __ra crashtest2.h 646:18 - operand
@@ -28598,7 +28598,7 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
         var_decl __losi crashtest2.h 645:18 - arg
         - isUsed: 1
    cleanup_point_expr crashtest2.h 660:48 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 660:48 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __rb crashtest2.h 646:24 - operand
@@ -28775,7 +28775,7 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
        type_decl float <built-in> 0:0 - type name
        - isAutogenerated: 1
    cleanup_point_expr crashtest2.h 673:72 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 673:72 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __losi crashtest2.h 669:18 - operand
@@ -28806,7 +28806,7 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
           integer_cst 0 - element
           integer_cst 0 - element
    cleanup_point_expr crashtest2.h 674:72 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 674:72 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __hisi crashtest2.h 669:10 - operand
@@ -28837,7 +28837,7 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
           integer_cst 0 - element
           integer_cst 0 - element
    cleanup_point_expr crashtest2.h 677:38 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 677:38 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __zero crashtest2.h 670:10 - operand
@@ -28845,7 +28845,7 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
        call_expr crashtest2.h 677:36 - operand
        - function: LOAD_LANES - operand
    cleanup_point_expr crashtest2.h 678:50 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 678:50 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __ra crashtest2.h 670:18 - operand
@@ -28857,7 +28857,7 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
         var_decl __losi crashtest2.h 669:18 - arg
         - isUsed: 1
    cleanup_point_expr crashtest2.h 679:48 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 679:48 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __rb crashtest2.h 670:24 - operand
@@ -28985,7 +28985,7 @@ function_decl _mm_cvtpi8_ps crashtest2.h 686:1
     var_decl __sign crashtest2.h 688:10 - operand
     - isUsed: 1
    cleanup_point_expr crashtest2.h 693:61 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 693:61 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __sign crashtest2.h 688:10 - operand
@@ -29019,7 +29019,7 @@ function_decl _mm_cvtpi8_ps crashtest2.h 686:1
             integer_cst 2147483647 - max value
           integer_cst 64 - parm size
    cleanup_point_expr crashtest2.h 696:63 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 696:63 - operand
      convert_expr - expresssion
       modify_expr - operand
        - isUsed: 1
@@ -29163,7 +29163,7 @@ function_decl _mm_cvtpu8_ps crashtest2.h 703:1
   integer_cst 64 - parm size
  statement_list - code
   cleanup_point_expr crashtest2.h 705:68 - statement
-   expr_stmt - operand
+   expr_stmt crashtest2.h 705:68 - operand
     convert_expr - expresssion
      modify_expr - operand
       - isUsed: 1
@@ -29355,7 +29355,7 @@ function_decl _mm_cvtpi32x2_ps crashtest2.h 711:1
     var_decl __zero crashtest2.h 713:10 - operand
     - isUsed: 1
    cleanup_point_expr crashtest2.h 713:44 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 713:44 - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __zero crashtest2.h 713:10 - operand
@@ -29709,7 +29709,7 @@ function_decl _mm_cvtps_pi8 crashtest2.h 732:1
     var_decl __tmp crashtest2.h 734:10 - operand
     - isUsed: 1
    cleanup_point_expr crashtest2.h 734:46 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 734:46 - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __tmp crashtest2.h 734:10 - operand
@@ -30216,7 +30216,7 @@ function_decl _mm_storeh_pi crashtest2.h 775:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 777:55 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 777:55 - operand
    call_expr crashtest2.h 777:27 - expresssion
    - function: LOAD_LANES - expresssion
     nop_expr - arg
@@ -30706,7 +30706,7 @@ function_decl _mm_storel_pi crashtest2.h 804:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 806:55 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 806:55 - operand
    call_expr crashtest2.h 806:27 - expresssion
    - function: LOAD_LANES - expresssion
     nop_expr - arg
@@ -31119,7 +31119,7 @@ function_decl _mm_setcsr crashtest2.h 850:1
    integer_cst 4294967295 - max value
   integer_cst 32 - parm size
  cleanup_point_expr crashtest2.h 852:31 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 852:31 - operand
    call_expr crashtest2.h 852:26 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -31176,7 +31176,7 @@ function_decl _MM_SET_EXCEPTION_STATE crashtest2.h 857:1
    integer_cst 4294967295 - max value
   integer_cst 32 - parm size
  cleanup_point_expr crashtest2.h 859:57 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 859:57 - operand
    call_expr crashtest2.h 859:13 - expresssion
    - function: LOAD_LANES - expresssion
     bit_ior_expr crashtest2.h 859:48 - arg
@@ -31238,7 +31238,7 @@ function_decl _MM_SET_EXCEPTION_MASK crashtest2.h 863:1
    integer_cst 4294967295 - max value
   integer_cst 32 - parm size
  cleanup_point_expr crashtest2.h 865:55 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 865:55 - operand
    call_expr crashtest2.h 865:13 - expresssion
    - function: LOAD_LANES - expresssion
     bit_ior_expr crashtest2.h 865:46 - arg
@@ -31300,7 +31300,7 @@ function_decl _MM_SET_ROUNDING_MODE crashtest2.h 869:1
    integer_cst 4294967295 - max value
   integer_cst 32 - parm size
  cleanup_point_expr crashtest2.h 871:56 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 871:56 - operand
    call_expr crashtest2.h 871:13 - expresssion
    - function: LOAD_LANES - expresssion
     bit_ior_expr crashtest2.h 871:47 - arg
@@ -31362,7 +31362,7 @@ function_decl _MM_SET_FLUSH_ZERO_MODE crashtest2.h 875:1
    integer_cst 4294967295 - max value
   integer_cst 32 - parm size
  cleanup_point_expr crashtest2.h 877:61 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 877:61 - operand
    call_expr crashtest2.h 877:13 - expresssion
    - function: LOAD_LANES - expresssion
     bit_ior_expr crashtest2.h 877:52 - arg
@@ -32495,7 +32495,7 @@ function_decl _mm_store_ss crashtest2.h 958:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 960:26 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 960:26 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -32685,7 +32685,7 @@ function_decl _mm_store_ps crashtest2.h 971:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 973:31 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 973:31 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -32769,7 +32769,7 @@ function_decl _mm_storeu_ps crashtest2.h 978:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 980:45 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 980:45 - operand
    call_expr crashtest2.h 980:27 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -32887,7 +32887,7 @@ function_decl _mm_store1_ps crashtest2.h 985:1
        type_decl float <built-in> 0:0 - type name
        - isAutogenerated: 1
    cleanup_point_expr crashtest2.h 989:29 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 989:29 - operand
      call_expr crashtest2.h 989:17 - expresssion
      - function: LOAD_LANES - expresssion
       - isUsed: 1
@@ -32964,7 +32964,7 @@ function_decl _mm_store_ps1 crashtest2.h 993:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 995:27 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 995:27 - operand
    call_expr crashtest2.h 995:17 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -33081,7 +33081,7 @@ function_decl _mm_storer_ps crashtest2.h 1000:1
        type_decl float <built-in> 0:0 - type name
        - isAutogenerated: 1
    cleanup_point_expr crashtest2.h 1004:28 - statement
-    expr_stmt - operand
+    expr_stmt crashtest2.h 1004:28 - operand
      call_expr crashtest2.h 1004:16 - expresssion
      - function: LOAD_LANES - expresssion
       - isUsed: 1
@@ -35087,7 +35087,7 @@ function_decl _mm_maskmove_si64 crashtest2.h 1160:1
     integer_cst 127 - max value
   integer_cst 64 - parm size
  cleanup_point_expr crashtest2.h 1162:58 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1162:58 - operand
    call_expr crashtest2.h 1162:27 - expresssion
    - function: LOAD_LANES - expresssion
     view_convert_expr - arg
@@ -35244,7 +35244,7 @@ function_decl _m_maskmovq crashtest2.h 1166:1
     integer_cst 127 - max value
   integer_cst 64 - parm size
  cleanup_point_expr crashtest2.h 1168:36 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1168:36 - operand
    call_expr crashtest2.h 1168:21 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -36319,7 +36319,7 @@ function_decl _mm_stream_pi crashtest2.h 1214:1
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  cleanup_point_expr crashtest2.h 1216:77 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1216:77 - operand
    call_expr crashtest2.h 1216:25 - expresssion
    - function: LOAD_LANES - expresssion
     nop_expr - arg
@@ -36416,7 +36416,7 @@ function_decl _mm_stream_ps crashtest2.h 1221:1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr crashtest2.h 1223:44 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1223:44 - operand
    call_expr crashtest2.h 1223:26 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -36463,7 +36463,7 @@ function_decl _mm_sfence crashtest2.h 1229:1
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr crashtest2.h 1231:27 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1231:27 - operand
    call_expr crashtest2.h 1231:25 - expresssion
    - function: LOAD_LANES - expresssion
 function_decl _mm_set_sd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 61:1
@@ -37673,7 +37673,7 @@ function_decl _mm_loadr_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1
     var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - operand
     - isUsed: 1
    cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:35 - statement
-    expr_stmt - operand
+    expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:35 - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - operand
@@ -37771,7 +37771,7 @@ function_decl _mm_store_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 161:24 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 161:24 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -37855,7 +37855,7 @@ function_decl _mm_storeu_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 168:37 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 168:37 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 168:27 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -37937,7 +37937,7 @@ function_decl _mm_store_sd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 175:26 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 175:26 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -38127,7 +38127,7 @@ function_decl _mm_storel_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 187:26 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 187:26 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 187:16 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -38209,7 +38209,7 @@ function_decl _mm_storeh_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 194:26 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 194:26 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -38313,7 +38313,7 @@ function_decl _mm_store1_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 202:75 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 202:75 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 202:16 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -38410,7 +38410,7 @@ function_decl _mm_store_pd1 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 208:27 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 208:27 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 208:17 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -38492,7 +38492,7 @@ function_decl _mm_storer_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 215:75 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 215:75 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 215:16 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -49390,7 +49390,7 @@ function_decl _mm_store_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.
     integer_cst 4294967295 - max value
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 710:13 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 710:13 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -49512,7 +49512,7 @@ function_decl _mm_storeu_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin
     integer_cst 4294967295 - max value
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 716:54 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 716:54 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 716:27 - expresssion
    - function: LOAD_LANES - expresssion
     nop_expr - arg
@@ -49635,7 +49635,7 @@ function_decl _mm_storel_epi64 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin
     integer_cst 4294967295 - max value
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 722:39 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 722:39 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -63404,7 +63404,7 @@ function_decl _mm_maskmoveu_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmint
     integer_cst 127 - max value
   integer_cst 64 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1431:62 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1431:62 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1431:29 - expresssion
    - function: LOAD_LANES - expresssion
     view_convert_expr - arg
@@ -63992,7 +63992,7 @@ function_decl _mm_stream_si32 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.
    integer_cst 2147483647 - max value
   integer_cst 32 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1455:35 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1455:35 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1455:25 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -64083,7 +64083,7 @@ function_decl _mm_stream_si64 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.
    integer_cst 4294967295 - max value
   integer_cst 64 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1462:37 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1462:37 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1462:27 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -64194,7 +64194,7 @@ function_decl _mm_stream_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin
     integer_cst 4294967295 - max value
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1469:54 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1469:54 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1469:26 - expresssion
    - function: LOAD_LANES - expresssion
     nop_expr - arg
@@ -64291,7 +64291,7 @@ function_decl _mm_stream_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h
     - isAutogenerated: 1
   integer_cst 128 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1475:44 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1475:44 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1475:26 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -64350,7 +64350,7 @@ function_decl _mm_clflush /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 14
     - isAutogenerated: 1
   integer_cst 64 - parm size
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1481:31 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1481:31 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1481:26 - expresssion
    - function: LOAD_LANES - expresssion
     - isUsed: 1
@@ -64383,7 +64383,7 @@ function_decl _mm_lfence /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 148
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1487:27 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1487:27 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1487:25 - expresssion
    - function: LOAD_LANES - expresssion
 function_decl _mm_mfence /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1491:1
@@ -64409,7 +64409,7 @@ function_decl _mm_mfence /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 149
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1493:27 - code
-  expr_stmt - operand
+  expr_stmt /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1493:27 - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1493:25 - expresssion
    - function: LOAD_LANES - expresssion
 function_decl _mm_cvtsi32_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1497:1
@@ -65277,6 +65277,6 @@ function_decl _mm_pause crashtest2.h 1262:1
    type_decl void <built-in> 0:0 - type name
    - isAutogenerated: 1
  cleanup_point_expr crashtest2.h 1264:26 - code
-  expr_stmt - operand
+  expr_stmt crashtest2.h 1264:26 - operand
    call_expr crashtest2.h 1264:24 - expresssion
    - function: LOAD_LANES - expresssion
diff --git a/test/crashtest3-01.txt b/test/crashtest3-01.txt
index de9bfb1..5548476 100644
--- a/test/crashtest3-01.txt
+++ b/test/crashtest3-01.txt
@@ -1,6 +1,8 @@
-exception: 
+exception: pointer_type this, 
+__base_ctor : pointer_type this, 
+__comp_ctor : pointer_type this, 
+bad_exception: pointer_type this, 
 __base_ctor : 
-__comp_ctor : 
-bad_exception: 
+__base_ctor : pointer_type this, 
 __base_ctor : 
-__comp_ctor : 
+__comp_ctor : pointer_type this, 
diff --git a/test/test1-01.txt b/test/test1-01.txt
index 84d97a1..d6e456a 100644
--- a/test/test1-01.txt
+++ b/test/test1-01.txt
@@ -69,7 +69,7 @@ function_decl func3 test1.c 7:6
   integer_cst 64 - parm size
  statement_list - code
   cleanup_point_expr test1.c 9:14 - statement
-   expr_stmt - operand
+   expr_stmt test1.c 9:14 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -87,7 +87,7 @@ function_decl func3 test1.c 7:6
         integer_cst 64 - parm size
       integer_cst 10 - operand
   cleanup_point_expr test1.c 10:15 - statement
-   expr_stmt - operand
+   expr_stmt test1.c 10:15 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -105,7 +105,7 @@ function_decl func3 test1.c 7:6
           integer_cst 127 - max value
         integer_cst 64 - parm size
       integer_cst 20 - operand
-  while_stmt - statement
+  while_stmt test1.c 11:5 - statement
    integer_cst 1 - condition
    statement_list - body
 function_decl main test1.c 14:5
@@ -150,7 +150,7 @@ function_decl main test1.c 14:5
      integer_cst 127 - max value
    statement_list - operand
     cleanup_point_expr test1.c 16:19 - statement
-     expr_stmt - operand
+     expr_stmt test1.c 16:19 - operand
       convert_expr - expresssion
        call_expr test1.c 16:6 - operand
        - function: LOAD_LANES - operand
@@ -172,7 +172,7 @@ function_decl main test1.c 14:5
        integer_cst -128 - min value
        integer_cst 127 - max value
     cleanup_point_expr test1.c 18:21 - statement
-     expr_stmt - operand
+     expr_stmt test1.c 18:21 - operand
       call_expr test1.c 18:14 - expresssion
       - function: LOAD_LANES - expresssion
        integer_cst 0 - arg
@@ -266,7 +266,7 @@ function_decl fun test1.c 21:6
    integer_cst -2147483648 - min value
    integer_cst 2147483647 - max value
   integer_cst 32 - parm size
- if_stmt - code
+ if_stmt test1.c 23:2 - code
   eq_expr test1.c 23:7 - condition
    - isUsed: 1
    parm_decl a test1.c 21:14 - operand
@@ -281,7 +281,7 @@ function_decl fun test1.c 21:6
     integer_cst 32 - parm size
    integer_cst 0 - operand
   cleanup_point_expr test1.c 24:12 - then
-   expr_stmt - operand
+   expr_stmt test1.c 24:12 - operand
     convert_expr - expresssion
      modify_expr - operand
       - isUsed: 1
@@ -332,7 +332,7 @@ function_decl fun test1.c 21:6
          integer_cst -2147483648 - min value
          integer_cst 2147483647 - max value
   cleanup_point_expr test1.c 26:6 - else
-   expr_stmt - operand
+   expr_stmt test1.c 26:6 - operand
     convert_expr - expresssion
      modify_expr - operand
       - isUsed: 1
@@ -450,7 +450,7 @@ function_decl fun1 test1.c 29:5
        integer_cst -2147483648 - min value
        integer_cst 2147483647 - max value
    cleanup_point_expr test1.c 32:5 - statement
-    expr_stmt - operand
+    expr_stmt test1.c 32:5 - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl c test1.c 3:5 - operand
@@ -468,12 +468,12 @@ function_decl fun1 test1.c 29:5
        var_decl b test1.c 31:14 - operand
        - isUsed: 1
    cleanup_point_expr test1.c 33:10 - statement
-    expr_stmt - operand
+    expr_stmt test1.c 33:10 - operand
      call_expr test1.c 33:5 - expresssion
      - function: LOAD_LANES - expresssion
       integer_cst 0 - arg
       integer_cst 1 - arg
-   if_stmt - statement
+   if_stmt test1.c 34:2 - statement
     eq_expr test1.c 34:6 - condition
      var_decl a test1.c 31:6 - operand
      - isUsed: 1
diff --git a/test/test1-02.txt b/test/test1-02.txt
index 9286f89..7b2bcea 100644
--- a/test/test1-02.txt
+++ b/test/test1-02.txt
@@ -48,7 +48,7 @@
 2 integer_cst 
 1 statement_list 
 2 cleanup_point_expr test1.c
-3 expr_stmt 
+3 expr_stmt test1.c
 4 convert_expr 
 5 modify_expr 
 6 indirect_ref 
@@ -62,7 +62,7 @@
 8 integer_cst 
 6 integer_cst 
 2 cleanup_point_expr test1.c
-3 expr_stmt 
+3 expr_stmt test1.c
 4 convert_expr 
 5 modify_expr 
 6 indirect_ref 
@@ -75,7 +75,7 @@
 10 integer_cst 
 8 integer_cst 
 6 integer_cst 
-2 while_stmt 
+2 while_stmt test1.c
 3 integer_cst 
 3 statement_list 
 0 function_decl test1.c
@@ -106,7 +106,7 @@
 5 integer_cst 
 3 statement_list 
 4 cleanup_point_expr test1.c
-5 expr_stmt 
+5 expr_stmt test1.c
 6 convert_expr 
 7 call_expr test1.c
 8 integer_cst 
@@ -122,7 +122,7 @@
 7 integer_cst 
 7 integer_cst 
 4 cleanup_point_expr test1.c
-5 expr_stmt 
+5 expr_stmt test1.c
 6 call_expr test1.c
 7 integer_cst 
 7 addr_expr 
@@ -186,7 +186,7 @@
 3 integer_cst 
 3 integer_cst 
 2 integer_cst 
-1 if_stmt 
+1 if_stmt test1.c
 2 eq_expr test1.c
 3 parm_decl test1.c
 4 integer_type 
@@ -197,7 +197,7 @@
 4 integer_cst 
 3 integer_cst 
 2 cleanup_point_expr test1.c
-3 expr_stmt 
+3 expr_stmt test1.c
 4 convert_expr 
 5 modify_expr 
 6 parm_decl test1.c
@@ -232,7 +232,7 @@
 9 integer_cst 
 9 integer_cst 
 2 cleanup_point_expr test1.c
-3 expr_stmt 
+3 expr_stmt test1.c
 4 convert_expr 
 5 modify_expr 
 6 parm_decl test1.c
@@ -316,7 +316,7 @@
 7 integer_cst 
 7 integer_cst 
 3 cleanup_point_expr test1.c
-4 expr_stmt 
+4 expr_stmt test1.c
 5 convert_expr 
 6 modify_expr 
 7 var_decl test1.c
@@ -329,11 +329,11 @@
 9 integer_cst 
 7 var_decl test1.c
 3 cleanup_point_expr test1.c
-4 expr_stmt 
+4 expr_stmt test1.c
 5 call_expr test1.c
 6 integer_cst 
 6 integer_cst 
-3 if_stmt 
+3 if_stmt test1.c
 4 eq_expr test1.c
 5 var_decl test1.c
 5 integer_cst 
diff --git a/test/test5-01.txt b/test/test5-01.txt
index ecc86a8..0adcce5 100644
--- a/test/test5-01.txt
+++ b/test/test5-01.txt
@@ -75,7 +75,7 @@ function_decl func1 test5.c 10:6
    integer_cst 2147483647 - max value
   integer_cst 8 - parm size
  cleanup_point_expr test5.c 12:13 - code
-  expr_stmt - operand
+  expr_stmt test5.c 12:13 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -169,7 +169,7 @@ function_decl func2 test5.c 15:6
    integer_cst 2147483647 - max value
   integer_cst 8 - parm size
  cleanup_point_expr test5.c 17:19 - code
-  expr_stmt - operand
+  expr_stmt test5.c 17:19 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -265,7 +265,7 @@ function_decl func3 test5.c 20:6
    integer_cst 2147483647 - max value
   integer_cst 8 - parm size
  cleanup_point_expr test5.c 22:25 - code
-  expr_stmt - operand
+  expr_stmt test5.c 22:25 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -379,7 +379,7 @@ function_decl func5 test5.c 25:6
      var_decl var1 test5.c 27:9 - operand
      - isUsed: 1
    cleanup_point_expr test5.c 28:22 - statement
-    expr_stmt - operand
+    expr_stmt test5.c 28:22 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -502,7 +502,7 @@ function_decl func6 test5.c 31:6
     var_decl var2 test5.c 33:10 - operand
     - isUsed: 1
    cleanup_point_expr test5.c 34:16 - statement
-    expr_stmt - operand
+    expr_stmt test5.c 34:16 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -620,7 +620,7 @@ function_decl func7 test5.c 37:6
     var_decl var3 test5.c 39:10 - operand
     - isUsed: 1
    cleanup_point_expr test5.c 40:16 - statement
-    expr_stmt - operand
+    expr_stmt test5.c 40:16 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -738,7 +738,7 @@ function_decl func8 test5.c 43:6
     var_decl var4 test5.c 45:11 - operand
     - isUsed: 1
    cleanup_point_expr test5.c 46:17 - statement
-    expr_stmt - operand
+    expr_stmt test5.c 46:17 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
diff --git a/test/test6-01.txt b/test/test6-01.txt
index 6fc2480..84ac14e 100644
--- a/test/test6-01.txt
+++ b/test/test6-01.txt
@@ -36,7 +36,7 @@ function_decl func1 test6.c 10:6
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  cleanup_point_expr test6.c 12:13 - code
-  expr_stmt - operand
+  expr_stmt test6.c 12:13 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -90,7 +90,7 @@ function_decl func2 test6.c 15:6
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
- if_stmt - code
+ if_stmt test6.c 17:5 - code
   eq_expr test6.c 17:10 - condition
    - isUsed: 1
    parm_decl a test6.c 15:17 - operand
@@ -107,7 +107,7 @@ function_decl func2 test6.c 15:6
    integer_cst 0 - operand
   return_expr test6.c 18:9 - then
   cleanup_point_expr test6.c 20:17 - else
-   expr_stmt - operand
+   expr_stmt test6.c 20:17 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -162,7 +162,7 @@ function_decl func3 test6.c 23:6
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  statement_list - code
-  if_stmt - statement
+  if_stmt test6.c 25:5 - statement
    eq_expr test6.c 25:10 - condition
     - isUsed: 1
     parm_decl a test6.c 23:17 - operand
@@ -179,7 +179,7 @@ function_decl func3 test6.c 23:6
     integer_cst 0 - operand
    return_expr test6.c 26:9 - then
   cleanup_point_expr test6.c 28:13 - statement
-   expr_stmt - operand
+   expr_stmt test6.c 28:13 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -233,7 +233,7 @@ function_decl func4 test6.c 31:6
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
- if_stmt - code
+ if_stmt test6.c 33:5 - code
   ne_expr - condition
    - isUsed: 1
    parm_decl a test6.c 31:17 - operand
@@ -249,7 +249,7 @@ function_decl func4 test6.c 31:6
     integer_cst 64 - parm size
    integer_cst 0 - operand
   cleanup_point_expr test6.c 35:17 - then
-   expr_stmt - operand
+   expr_stmt test6.c 35:17 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -304,7 +304,7 @@ function_decl func5 test6.c 39:6
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  statement_list - code
-  if_stmt - statement
+  if_stmt test6.c 41:5 - statement
    ne_expr - condition
     - isUsed: 1
     parm_decl a test6.c 39:17 - operand
@@ -320,7 +320,7 @@ function_decl func5 test6.c 39:6
      integer_cst 64 - parm size
     integer_cst 0 - operand
    cleanup_point_expr test6.c 43:17 - then
-    expr_stmt - operand
+    expr_stmt test6.c 43:17 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -338,7 +338,7 @@ function_decl func5 test6.c 39:6
          integer_cst 64 - parm size
        integer_cst 500 - operand
   cleanup_point_expr test6.c 45:13 - statement
-   expr_stmt - operand
+   expr_stmt test6.c 45:13 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -395,7 +395,7 @@ function_decl func6 test6.c 48:6
  bind_expr test6.c 56:13 - code
   statement_list - operand
    bind_expr test6.c 54:5 - statement
-    if_stmt - operand
+    if_stmt test6.c 50:5 - operand
      eq_expr test6.c 50:10 - condition
       - isUsed: 1
       parm_decl a test6.c 48:17 - operand
@@ -433,7 +433,7 @@ function_decl func6 test6.c 48:6
      block - sub block
       var_decl k test6.c 52:13 - block vars
    cleanup_point_expr test6.c 56:13 - statement
-    expr_stmt - operand
+    expr_stmt test6.c 56:13 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -494,11 +494,11 @@ function_decl func7 test6.c 59:6
  bind_expr test6.c 70:16 - code
   statement_list - operand
    bind_expr test6.c 68:5 - statement
-    if_stmt - operand
+    if_stmt test6.c 61:5 - operand
      integer_cst 0 - condition
      bind_expr test6.c 67:9 - then
       bind_expr test6.c 67:9 - operand
-       if_stmt - operand
+       if_stmt test6.c 63:9 - operand
         eq_expr test6.c 63:14 - condition
          - isUsed: 1
          parm_decl aptr test6.c 59:17 - operand
@@ -545,7 +545,7 @@ function_decl func7 test6.c 59:6
        block - sub block
         var_decl k test6.c 65:17 - block vars
    cleanup_point_expr test6.c 70:16 - statement
-    expr_stmt - operand
+    expr_stmt test6.c 70:16 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
@@ -608,7 +608,7 @@ function_decl func8 test6.c 73:6
  bind_expr test6.c 85:16 - code
   statement_list - operand
    bind_expr test6.c 83:5 - statement
-    if_stmt - operand
+    if_stmt test6.c 75:5 - operand
      eq_expr test6.c 75:10 - condition
       - isUsed: 1
       parm_decl aptr test6.c 73:17 - operand
@@ -626,7 +626,7 @@ function_decl func8 test6.c 73:6
      bind_expr test6.c 82:15 - then
       statement_list - operand
        bind_expr test6.c 81:9 - statement
-        if_stmt - operand
+        if_stmt test6.c 77:9 - operand
          integer_cst 0 - condition
          bind_expr test6.c 80:23 - then
           var_decl k test6.c 79:17 - operand
@@ -677,7 +677,7 @@ function_decl func8 test6.c 73:6
         var_decl k test6.c 79:17 - block vars
         var_decl l test6.c 80:17 - block vars
    cleanup_point_expr test6.c 85:16 - statement
-    expr_stmt - operand
+    expr_stmt test6.c 85:16 - operand
      convert_expr - expresssion
       modify_expr - operand
        indirect_ref - operand
diff --git a/test/test7-01.txt b/test/test7-01.txt
index 868c093..c791334 100644
--- a/test/test7-01.txt
+++ b/test/test7-01.txt
@@ -112,7 +112,7 @@ function_decl func2 test7.cpp 8:10
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  cleanup_point_expr test7.cpp 10:18 - code
-  expr_stmt - operand
+  expr_stmt test7.cpp 10:18 - operand
    convert_expr - expresssion
     modify_expr - operand
      indirect_ref - operand
@@ -196,7 +196,7 @@ function_decl func3 test7.cpp 13:10
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
- if_stmt - code
+ if_stmt test7.cpp 15:9 - code
   ne_expr - condition
    - isUsed: 1
    parm_decl aptr test7.cpp 13:21 - operand
@@ -212,7 +212,7 @@ function_decl func3 test7.cpp 13:10
     integer_cst 64 - parm size
    integer_cst 0 - operand
   cleanup_point_expr test7.cpp 16:22 - then
-   expr_stmt - operand
+   expr_stmt test7.cpp 16:22 - operand
     convert_expr - expresssion
      modify_expr - operand
       indirect_ref - operand
@@ -297,7 +297,7 @@ function_decl func4 test7.cpp 19:10
     integer_cst 2147483647 - max value
   integer_cst 64 - parm size
  cleanup_point_expr test7.cpp 21:14 - code
-  expr_stmt - operand
+  expr_stmt test7.cpp 21:14 - operand
    convert_expr - expresssion
     modify_expr - operand
      component_ref - operand
diff --git a/test/test7-02.txt b/test/test7-02.txt
index 61de238..5342eb8 100644
--- a/test/test7-02.txt
+++ b/test/test7-02.txt
@@ -75,7 +75,7 @@
 4 integer_cst 
 2 integer_cst 
 1 cleanup_point_expr test7.cpp
-2 expr_stmt 
+2 expr_stmt test7.cpp
 3 convert_expr 
 4 modify_expr 
 5 indirect_ref 
@@ -133,7 +133,7 @@
 4 integer_cst 
 4 integer_cst 
 2 integer_cst 
-1 if_stmt 
+1 if_stmt test7.cpp
 2 ne_expr 
 3 parm_decl test7.cpp
 4 pointer_type 
@@ -145,7 +145,7 @@
 4 integer_cst 
 3 integer_cst 
 2 cleanup_point_expr test7.cpp
-3 expr_stmt 
+3 expr_stmt test7.cpp
 4 convert_expr 
 5 modify_expr 
 6 indirect_ref 
@@ -204,7 +204,7 @@
 4 integer_cst 
 2 integer_cst 
 1 cleanup_point_expr test7.cpp
-2 expr_stmt 
+2 expr_stmt test7.cpp
 3 convert_expr 
 4 modify_expr 
 5 component_ref