Merge branch 'regimplify'

Conflicts:
	src/aop-pc-exit.c

diff --cc src/aop-main.c
Simple merge

diff --cc src/aop-pc-assign.c
Simple merge

diff --cc src/aop-pc-entry.c
index 293a29935f40497a4345cec66d77be928b96ce11,66145d56e91ba6b4cb564206c1be836dd5015259..e66d494b9116a8cdff805dbda85e0d9a82b5fa2b
--- 1/src/aop-pc-entry.c
--- 2/src/aop-pc-entry.c
+++ b/src/aop-pc-entry.c
@@@ -118,12 -74,11 +118,14 @@@ aop_match_function_entry (
    struct aop_pointcut *pc;
    pc = ggc_alloc (sizeof (struct aop_pointcut));
    pc->kind = ATP_ENTRY;
+   pc->need_regimplification = false;
+ 
    pc->join_on = op_join_on_function_entry;
    pc->insert_before = op_default_insert_before;
 -  pc->prepare_for_weave = op_default_prepare_for_weave;
 +  pc->insert_after = op_default_insert_after;
 +  pc->prepare_for_weave = op_prepare_entry;
 +
 +  pc->pc_entry.function_name = NULL;
    return pc;
  }
  

diff --cc src/aop-pc-exit.c
index 56e1f570dc951bdc0ae07a69f70cc923a8dfc818,2869fa66f0f3e0ec4cab9602b17fbe657c5d400e..857ef4051dcb48d94b1f1e77da49e815466c3f5a
--- 1/src/aop-pc-exit.c
--- 2/src/aop-pc-exit.c
+++ b/src/aop-pc-exit.c
@@@ -105,14 -70,11 +105,17 @@@ aop_match_function_exit (
    struct aop_pointcut *pc;  
    pc = ggc_alloc (sizeof (struct aop_pointcut));
    pc->kind = ATP_EXIT;
+   pc->need_regimplification = false;
+ 
    pc->join_on = op_join_on_function_exit;
    pc->insert_before = op_default_insert_before;
 -  pc->prepare_for_weave = op_default_prepare_for_weave;
 +  pc->insert_after = op_default_insert_after;
 +  pc->prepare_for_weave = op_prepare_exit;
+ 
    return pc;
  }
 +
 +/* Close Doxygen defgroup block. */
 +/**
 + * /}
 + */

diff --cc src/aop-pc-fun-call.c
index fa7a82d247899e5a7dde085b35e0cf01ab8a708f,199bae1538a0c5d3eb9e3bd3f4cf504adfc80db9..0d5b9529253c95cc143baa1ff12642b99d1df362
--- 1/src/aop-pc-fun-call.c
--- 2/src/aop-pc-fun-call.c
+++ b/src/aop-pc-fun-call.c
@@@ -185,9 -126,9 +187,10 @@@ aop_match_function_call (
    pc->insert_before = op_default_insert_before;
    pc->prepare_for_weave = op_default_prepare_for_weave;
  
 -  /* Initialize the list to NULL */
 +  pc->pc_call.function_name = NULL;
 +  pc->pc_call.return_type = NULL;
    pc->pc_call.param_list_head = NULL;
+ 
    return pc;
  }
  

diff --cc src/aop-pointcut.h
Simple merge