1 files changed, 2 insertions, 76 deletions
diff --git a/test/test22-03.txt b/test/test22-03.txt
index 98eb9fb..650e898 100644
--- a/test/test22-03.txt
+++ b/test/test22-03.txt
@@ -2632,8 +2632,6 @@ bind_expr :
 statement_list : 
 cleanup_point_expr : 
 decl_expr : 
-addr_expr : 
-function_decl __gthrw___pthread_key_create: 
 var_decl __gthread_active_ptr: 
 integer_cst 64: 
 addr_expr : 
@@ -2675,8 +2673,6 @@ function_decl __gthrw___pthread_key_create:
 pointer_type : 
 void_type : 
 type_decl void: 
-addr_expr : 
-function_decl __gthrw___pthread_key_create: 
 function_decl __gthread_create: 
 cleanup_point_expr : __args, __func, __threadid, 
 return_expr : __args, __func, __threadid, 
@@ -2833,8 +2829,6 @@ bind_expr : __func, __once,
 statement_list : __func, __once, 
 cleanup_point_expr : __func, __once, 
 decl_expr : __func, __once, 
-addr_expr : __func, __once, 
-function_decl __gthrw___pthread_key_create: __func, __once, 
 var_decl __gthread_active_ptr: __func, __once, 
 integer_cst 64: __func, __once, 
 addr_expr : __func, __once, 
@@ -2876,8 +2870,6 @@ function_decl __gthrw___pthread_key_create: __func, __once,
 pointer_type : __func, __once, 
 void_type : __func, __once, 
 type_decl void: __func, __once, 
-addr_expr : __func, __once, 
-function_decl __gthrw___pthread_key_create: __func, __once, 
 integer_cst 0: __func, __once, 
 cleanup_point_expr : __func, __once, 
 return_expr : __func, __once, 
@@ -3030,8 +3022,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3073,8 +3063,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 expr_stmt : __mutex, 
@@ -3118,8 +3106,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3161,8 +3147,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3222,8 +3206,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3265,8 +3247,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3326,8 +3306,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3369,8 +3347,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3430,8 +3406,6 @@ bind_expr : __abs_timeout, __mutex,
 statement_list : __abs_timeout, __mutex, 
 cleanup_point_expr : __abs_timeout, __mutex, 
 decl_expr : __abs_timeout, __mutex, 
-addr_expr : __abs_timeout, __mutex, 
-function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex, 
 var_decl __gthread_active_ptr: __abs_timeout, __mutex, 
 integer_cst 64: __abs_timeout, __mutex, 
 addr_expr : __abs_timeout, __mutex, 
@@ -3473,8 +3447,6 @@ function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex,
 pointer_type : __abs_timeout, __mutex, 
 void_type : __abs_timeout, __mutex, 
 type_decl void: __abs_timeout, __mutex, 
-addr_expr : __abs_timeout, __mutex, 
-function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex, 
 integer_cst 0: __abs_timeout, __mutex, 
 cleanup_point_expr : __abs_timeout, __mutex, 
 return_expr : __abs_timeout, __mutex, 
@@ -3539,8 +3511,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3582,8 +3552,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3656,8 +3624,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3699,8 +3665,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3796,8 +3760,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -3839,8 +3801,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -3936,8 +3896,6 @@ bind_expr : __abs_timeout, __mutex,
 statement_list : __abs_timeout, __mutex, 
 cleanup_point_expr : __abs_timeout, __mutex, 
 decl_expr : __abs_timeout, __mutex, 
-addr_expr : __abs_timeout, __mutex, 
-function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex, 
 var_decl __gthread_active_ptr: __abs_timeout, __mutex, 
 integer_cst 64: __abs_timeout, __mutex, 
 addr_expr : __abs_timeout, __mutex, 
@@ -3979,8 +3937,6 @@ function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex,
 pointer_type : __abs_timeout, __mutex, 
 void_type : __abs_timeout, __mutex, 
 type_decl void: __abs_timeout, __mutex, 
-addr_expr : __abs_timeout, __mutex, 
-function_decl __gthrw___pthread_key_create: __abs_timeout, __mutex, 
 integer_cst 0: __abs_timeout, __mutex, 
 cleanup_point_expr : __abs_timeout, __mutex, 
 return_expr : __abs_timeout, __mutex, 
@@ -4086,8 +4042,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -4129,8 +4083,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -4226,8 +4178,6 @@ bind_expr : __mutex,
 statement_list : __mutex, 
 cleanup_point_expr : __mutex, 
 decl_expr : __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 var_decl __gthread_active_ptr: __mutex, 
 integer_cst 64: __mutex, 
 addr_expr : __mutex, 
@@ -4269,8 +4219,6 @@ function_decl __gthrw___pthread_key_create: __mutex,
 pointer_type : __mutex, 
 void_type : __mutex, 
 type_decl void: __mutex, 
-addr_expr : __mutex, 
-function_decl __gthrw___pthread_key_create: __mutex, 
 integer_cst 0: __mutex, 
 cleanup_point_expr : __mutex, 
 return_expr : __mutex, 
@@ -4900,8 +4848,6 @@ bind_expr : __mem,
 statement_list : __mem, 
 cleanup_point_expr : __mem, 
 decl_expr : __mem, 
-addr_expr : __mem, 
-function_decl __gthrw___pthread_key_create: __mem, 
 var_decl __gthread_active_ptr: __mem, 
 integer_cst 64: __mem, 
 addr_expr : __mem, 
@@ -4943,8 +4889,6 @@ function_decl __gthrw___pthread_key_create: __mem,
 pointer_type : __mem, 
 void_type : __mem, 
 type_decl void: __mem, 
-addr_expr : __mem, 
-function_decl __gthrw___pthread_key_create: __mem, 
 integer_cst 0: __mem, 
 cleanup_point_expr : __mem, 
 return_expr : __mem, 
@@ -5150,8 +5094,6 @@ bind_expr : __mem,
 statement_list : __mem, 
 cleanup_point_expr : __mem, 
 decl_expr : __mem, 
-addr_expr : __mem, 
-function_decl __gthrw___pthread_key_create: __mem, 
 var_decl __gthread_active_ptr: __mem, 
 integer_cst 64: __mem, 
 addr_expr : __mem, 
@@ -5193,8 +5135,6 @@ function_decl __gthrw___pthread_key_create: __mem,
 pointer_type : __mem, 
 void_type : __mem, 
 type_decl void: __mem, 
-addr_expr : __mem, 
-function_decl __gthrw___pthread_key_create: __mem, 
 integer_cst 0: __mem, 
 cleanup_point_expr : __mem, 
 expr_stmt : __mem, 
@@ -9735,6 +9675,8 @@ function_decl func3:
 bind_expr : ptr1, 
 statement_list : ptr1, 
 decl_expr : ptr1, 
+var_decl ptr2: ptr1, 
+integer_cst 64: ptr1, 
 addr_expr : ptr1, 
 test22.cpp: In member function 'int Object1::func3(Data1*)':
 test22.cpp:50:17: warning: Using variable 'ptr1' without checking for null pointer
@@ -9745,15 +9687,6 @@ pointer_type : ptr1,
 record_type : ptr1, 
 type_decl Data1: ptr1, 
 integer_cst 64: ptr1, 
-var_decl ptr2: ptr1, 
-integer_cst 64: ptr1, 
-addr_expr : ptr1, 
-test22.cpp:50:17: warning: Using variable 'ptr1' without checking for null pointer
-parm_decl ptr1: ptr1, 
-pointer_type : ptr1, 
-record_type : ptr1, 
-type_decl Data1: ptr1, 
-integer_cst 64: ptr1, 
 pointer_type : ptr1, 
 pointer_type : ptr1, 
 record_type : ptr1, 
@@ -9813,13 +9746,6 @@ pointer_type : ptr1,
 pointer_type : ptr1, 
 record_type : ptr1, 
 type_decl Data1: ptr1, 
-addr_expr : ptr1, 
-test22.cpp:50:17: warning: Using variable 'ptr1' without checking for null pointer
-parm_decl ptr1: ptr1, 
-pointer_type : ptr1, 
-record_type : ptr1, 
-type_decl Data1: ptr1, 
-integer_cst 64: ptr1, 
 function_decl func4: 
 if_stmt : ptr1, 
 cleanup_point_expr : ptr1,