use op_array extension only for PHPs 8.0+

Author: lavarou

agent/php_execute.c

@@ -93,6 +93,7 @@
  * conditions wherever possible.
  */
 
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO
 static inline nruserfn_t* nr_php_get_wraprec_from_op_array_extension(const char* fn, zend_function* zf) {
   nruserfn_t* wraprec = (nruserfn_t*)ZEND_OP_ARRAY_EXTENSION(&zf->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle));
   nrl_verbosedebug(NRL_AGENT, "%s from %s, op_array_extension=%p, wraprec=%p, wraprec->pid=%d", __func__, fn, ZEND_OP_ARRAY_EXTENSION(&zf->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle)), wraprec, wraprec? wraprec->pid : 0);
@@ -102,6 +103,7 @@ static inline nruserfn_t* nr_php_get_wraprec_from_op_array_extension(const char*
   }
   return wraprec;
 }
+#endif
 
 static void nr_php_show_exec_return(NR_EXECUTE_PROTO TSRMLS_DC);
 static int nr_php_show_exec_indentation(TSRMLS_D);
@@ -608,8 +610,13 @@ static void nr_php_show_exec(NR_EXECUTE_PROTO TSRMLS_DC) {
   char argstr[NR_EXECUTE_DEBUG_STRBUFSZ];
   const char* filename = nr_php_op_array_file_name(NR_OP_ARRAY);
   const char* function_name = nr_php_op_array_function_name(NR_OP_ARRAY);
+#if ZEND_MODULE_API_NO >= ZEND_7_4_X_API_NO
+  #if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO
   nruserfn_t* wr = nr_php_get_wraprec_from_op_array_extension(__func__, execute_data->func);
-
+  #else
+  nruserfn_t* wr = nr_php_get_wraprec(execute_data->func);
+  #endif
+#endif
   argstr[0] = '\0';
 
   if (NR_OP_ARRAY->scope) {

agent/php_globals.h

@@ -52,7 +52,9 @@ typedef struct _nrphpglobals_t {
 #else
   int zend_offset;          /* Zend extension offset */
 #endif
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP 8.0+ */
   int op_array_extension_handle; /* Zend op_array extension handle to attach agent's data to function */
+#endif
   int done_instrumentation;  /* Set to true if we have installed instrumentation
                                 handlers */
   nrtime_t expensive_min;    /* newrelic.special.expensive_node_min */

agent/php_minit.c

@@ -720,9 +720,9 @@ PHP_MINIT_FUNCTION(newrelic) {
   nr_php_set_opcode_handlers();
 
   nrl_debug(NRL_INIT, "MINIT processing done");
-#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP 7.4+ */
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP 8.0+ */
   NR_PHP_PROCESS_GLOBALS(zend_offset) = zend_get_resource_handle(dummy);
-#if ZEND_MODULE_API_NO >= ZEND_8_4_X_API_NO /* PHP 7.4+ */
+#if ZEND_MODULE_API_NO >= ZEND_8_4_X_API_NO /* PHP 8.4+ */
   NR_PHP_PROCESS_GLOBALS(op_array_extension_handle) = zend_get_internal_function_extension_handle("newrelic");
 #else
   NR_PHP_PROCESS_GLOBALS(op_array_extension_handle) = zend_get_op_array_extension_handle("newrelic");

agent/php_user_instrument.c

@@ -130,6 +130,7 @@ static nr_php_wraprec_hashmap_t* user_function_wrappers;
 static inline void nr_php_wraprec_lookup_set(nruserfn_t* wr,
                                              zend_function* zf) {
   nr_php_wraprec_hashmap_update(user_function_wrappers, zf, wr);
+#if ZEND_MODULE_API_NO >= ZEND_8_0_X_API_NO /* PHP 8.0+ */
   // for situation when wraprec is added after first execution of the function
   // store the wraprec in the op_array extension for the duration of the request for later lookup
   // The op_array extension slot for function may not be initialized yet because it is
@@ -139,7 +140,7 @@ static inline void nr_php_wraprec_lookup_set(nruserfn_t* wr,
   if (NULL != RUN_TIME_CACHE(&zf->op_array)) {
     ZEND_OP_ARRAY_EXTENSION(&zf->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle)) = wr;
   }
-
+#endif
 }
 static inline nruserfn_t* nr_php_wraprec_lookup_get(zend_function* zf) {
   nruserfn_t* wraprec = NULL;