1 files changed, 4 insertions, 2 deletions
diff --git a/pp_hot.c b/pp_hot.c
index a78f022472..61d8b4371f 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -2869,8 +2869,10 @@ try_autoload:
 	    PL_curcopdb = NULL;
 	}
 	/* Do we need to open block here? XXXX */
-	if (CvXSUB(cv)) /* XXX this is supposed to be true */
-	    (void)(*CvXSUB(cv))(aTHX_ cv);
+
+	/* CvXSUB(cv) must not be NULL because newXS() refuses NULL xsub address */
+	assert(CvXSUB(cv));
+	CALL_FPTR(CvXSUB(cv))(aTHX_ cv);
 
 	/* Enforce some sanity in scalar context. */
 	if (gimme == G_SCALAR && ++markix != PL_stack_sp - PL_stack_base ) {