Order of prepare_for_weave and insert advice is fixed

diff --git a/src/aop-weave.c b/src/aop-weave.c
index f5465b778bec8189cb7acea4e479c9357a991cea..d4b2682abe4fd54c049a04baa6294d7e17d9877e 100644 (file)
--- a/src/aop-weave.c
+++ b/src/aop-weave.c
@@ -175,10 +175,6 @@ aop_insert_advice (struct aop_joinpoint *jp, const char *func_name,
   gimple func_call;
   struct aop_pointcut *pc;
 
-  va_start (argp, location);
-  func_call = build_gcc_call (func_name, void_type_node, argp);
-  va_end (argp);
-
   pc = jp->pc;
 
   /* Make sure this joinpoint is prepared for advice. */
@@ -188,9 +184,13 @@ aop_insert_advice (struct aop_joinpoint *jp, const char *func_name,
       jp->is_prepared = true;
     }
 
+  va_start (argp, location);
+  func_call = build_gcc_call (func_name, void_type_node, argp);
+  va_end (argp);
+  
   if(location == AOP_INSERT_BEFORE)
     pc->insert_before(jp, func_call);
   else if(location == AOP_INSERT_AFTER)
     pc->insert_after(jp, func_call);
-  pc = jp->pc;
+
 }