Get rid of CALL_FPTR()

diff --git a/indirect.xs b/indirect.xs
index dedc58bb453c9003a10980dc27dda2a774dde32a..dde55dfa636acdfca31e461d8c1a9d9380882bd5 100644 (file)
--- a/indirect.xs
+++ b/indirect.xs
@@ -483,7 +483,7 @@ STATIC int indirect_find(pTHX_ SV *sv, const char *s, STRLEN *pos) {
 STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_const(pTHX_ OP *o) {
 STATIC OP *(*indirect_old_ck_const)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_const(pTHX_ OP *o) {

- o = CALL_FPTR(indirect_old_ck_const)(aTHX_ o);
+ o = indirect_old_ck_const(aTHX_ o);

 
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;
 
  if (indirect_hint()) {
   SV *sv = cSVOPo_sv;


@@ -556,14 +556,14 @@ STATIC OP *indirect_ck_rv2sv(pTHX_ OP *o) {
     goto done;
   }
 
     goto done;
   }
 

-  o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+  o = indirect_old_ck_rv2sv(aTHX_ o);

 
   indirect_map_store(o, pos, sv, CopLINE(&PL_compiling));
   return o;
  }
 
 done:
 
   indirect_map_store(o, pos, sv, CopLINE(&PL_compiling));
   return o;
  }
 
 done:

- o = CALL_FPTR(indirect_old_ck_rv2sv)(aTHX_ o);
+ o = indirect_old_ck_rv2sv(aTHX_ o);

 
  indirect_map_delete(o);
  return o;
 
  indirect_map_delete(o);
  return o;


@@ -574,7 +574,7 @@ done:
 STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_padany(pTHX_ OP *o) {
 STATIC OP *(*indirect_old_ck_padany)(pTHX_ OP *) = 0;
 
 STATIC OP *indirect_ck_padany(pTHX_ OP *o) {

- o = CALL_FPTR(indirect_old_ck_padany)(aTHX_ o);
+ o = indirect_old_ck_padany(aTHX_ o);

 
  if (indirect_hint()) {
   SV *sv;
 
  if (indirect_hint()) {
   SV *sv;


@@ -608,7 +608,7 @@ STATIC OP *indirect_ck_scope(pTHX_ OP *o) {
   case OP_SCOPE:   old_ck = indirect_old_ck_scope;   break;
   case OP_LINESEQ: old_ck = indirect_old_ck_lineseq; break;
  }
   case OP_SCOPE:   old_ck = indirect_old_ck_scope;   break;
   case OP_LINESEQ: old_ck = indirect_old_ck_lineseq; break;
  }

- o = CALL_FPTR(old_ck)(aTHX_ o);
+ o = old_ck(aTHX_ o);

 
  if (indirect_hint()) {
   indirect_map_store(o, PL_oldbufptr - SvPVX_const(PL_linestr),
 
  if (indirect_hint()) {
   indirect_map_store(o, PL_oldbufptr - SvPVX_const(PL_linestr),


@@ -648,7 +648,7 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
     * expression. */
    line = oi->line;
 
     * expression. */
    line = oi->line;
 

-   o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+   o = indirect_old_ck_method(aTHX_ o);

    /* o may now be a method_named */
 
    indirect_map_store(o, pos, sv, line);
    /* o may now be a method_named */
 
    indirect_map_store(o, pos, sv, line);


@@ -657,7 +657,7 @@ STATIC OP *indirect_ck_method(pTHX_ OP *o) {
  }
 
 done:
  }
 
 done:

- o = CALL_FPTR(indirect_old_ck_method)(aTHX_ o);
+ o = indirect_old_ck_method(aTHX_ o);

 
  indirect_map_delete(o);
  return o;
 
  indirect_map_delete(o);
  return o;


@@ -685,14 +685,14 @@ STATIC OP *indirect_ck_method_named(pTHX_ OP *o) {
    goto done;
   line = CopLINE(&PL_compiling);
 
    goto done;
   line = CopLINE(&PL_compiling);
 

-  o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+  o = indirect_old_ck_method_named(aTHX_ o);

 
   indirect_map_store(o, pos, sv, line);
   return o;
  }
 
 done:
 
   indirect_map_store(o, pos, sv, line);
   return o;
  }
 
 done:

- o = CALL_FPTR(indirect_old_ck_method_named)(aTHX_ o);
+ o = indirect_old_ck_method_named(aTHX_ o);

 
  indirect_map_delete(o);
  return o;
 
  indirect_map_delete(o);
  return o;


@@ -705,7 +705,7 @@ STATIC OP *(*indirect_old_ck_entersub)(pTHX_ OP *) = 0;
 STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
  SV *code = indirect_hint();
 
 STATIC OP *indirect_ck_entersub(pTHX_ OP *o) {
  SV *code = indirect_hint();
 

- o = CALL_FPTR(indirect_old_ck_entersub)(aTHX_ o);
+ o = indirect_old_ck_entersub(aTHX_ o);

 
  if (code) {
   const indirect_op_info_t *moi, *ooi;
 
  if (code) {
   const indirect_op_info_t *moi, *ooi;