use NR_OP_ARRAY macro when accessing &execute_data->func->op_array

Co-authored-by: Amber Sistla <[email protected]>

Author: lavarou

agent/php_observer.c

@@ -98,7 +98,7 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
     return handlers;
   }
 
-  if (OP_ARRAY_IS_A_METHOD(&execute_data->func->op_array)) {
+  if (OP_ARRAY_IS_A_METHOD(NR_OP_ARRAY)) {
     scope_name = execute_data->func->op_array.scope->name;
     func_name = execute_data->func->op_array.function_name;
 #if 0
@@ -108,21 +108,21 @@ static zend_observer_fcall_handlers nr_php_fcall_register_handlers(
                 ZSTR_VAL(scope_name), scope_name->h, cn_hash,
                 ZSTR_VAL(func_name), func_name->h, fn_hash);
 #endif
-  } else if (OP_ARRAY_IS_A_FUNCTION(&execute_data->func->op_array)){
+  } else if (OP_ARRAY_IS_A_FUNCTION(NR_OP_ARRAY)){
     func_name = execute_data->func->op_array.function_name;
 #if 0
     zend_long fn_hash = zend_hash_func(ZSTR_VAL(func_name), ZSTR_LEN(func_name));
     nrl_always("function_name=%s, function_name->h=%zu, fn_hash=%zu", ZSTR_VAL(func_name), func_name->h, fn_hash);
 #endif
   }
 
-  if (!ZEND_OP_ARRAY_EXTENSION(&execute_data->func->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle))) {
+  if (!ZEND_OP_ARRAY_EXTENSION(NR_OP_ARRAY, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle))) {
     // nrl_always("wraprec not installed yet");
     wr = nr_php_user_instrument_wraprec_hashmap_get(func_name, scope_name);
     // nrl_always("found wraprec=%p", wr);
 
     // store the wraprec in the op_array extension for the duration of the request for later lookup
-    ZEND_OP_ARRAY_EXTENSION(&execute_data->func->op_array, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle)) = wr;
+    ZEND_OP_ARRAY_EXTENSION(NR_OP_ARRAY, NR_PHP_PROCESS_GLOBALS(op_array_extension_handle)) = wr;
   }
   //  else {
   //   nrl_always("wraprec already installed");