Fix other typos in param name/code comments

Closes GH-5502

diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index 4754f3171395613084b40acb35b0db7d4eb6225c..f9cbde39d2424cb0eba3b332ae4007c6a6463500 100644 (file)
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -85,7 +85,7 @@ static zend_always_inline void gc_check_possible_root(zend_refcounted *ref)
 }
 
 /* These APIs can be used to simplify object get_gc implementations
- * over heterogenous structures. See zend_generator_get_gc() for
+ * over heterogeneous structures. See zend_generator_get_gc() for
  * a usage example. */
 
 typedef struct {

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index cd1f59f5550057e179e99450582c89037f1d2773..e6434e52cfeb0a8629a0796cb50a0883c3bc712e 100644 (file)
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -25,7 +25,7 @@
 #include "php_com_dotnet_internal.h"
 #include "Zend/zend_exceptions.h"
 
-static zval *com_property_read(zend_object *object, zend_string *member, int type, void **cahce_slot, zval *rv)
+static zval *com_property_read(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv)
 {
        php_com_dotnet_object *obj;
        VARIANT v;

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 61d2750ce9f8989a0fe701bae649b9bef1aaff4b..65449c3d8fd52faa7352bb55216c98d3d951a588 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -842,7 +842,7 @@ zend_function *zend_optimizer_get_called_func(
                                                 * as a prototype, as it may be overridden with changed signature. */
                                                return same_scope ? fbc : NULL;
                                        }
-                                       /* If the method is non-final, it may be overriden,
+                                       /* If the method is non-final, it may be overridden,
                                         * but only with a compatible method signature. */
                                        *is_prototype = !is_final;
                                        return fbc;

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 49c3e9b556795bf88d9893aa9453cf8e4afad583..a3a956cfbed416c4f4caaed781c45a7d3c25e51a 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -2569,7 +2569,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                        }
                }
 
-               // TODO: Merge two loops implementing paralel move ???
+               // TODO: Merge two loops implementing parallel move ???
                for (i = 0; i < parent_vars_count; i++) {
                        if (STACK_REG(parent_stack, i) != ZREG_NONE) {
                                if (ra && ra[i] && ra[i]->reg == STACK_REG(parent_stack, i)) {
@@ -2621,7 +2621,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
                                                        goto jit_failure;
                                                }
                                        } else {
-                                               /* Register has to be writen back on side exit */
+                                               /* Register has to be written back on side exit */
                                                SET_STACK_REG(stack, phi->var, ival->reg);
                                        }
                                }
@@ -4909,7 +4909,7 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
        }
 
        /* Lock-free check if the side trace was already JIT-ed or blacklist-ed in another process */
-       // TODO: We may remoive this, becaus of the same check in zend_jit_trace_hot_side() ???
+       // TODO: We may remove this, because of the same check in zend_jit_trace_hot_side() ???
        opline = t->exit_info[exit_num].opline;
        if (EG(vm_interrupt) || ((uintptr_t)opline & (ZEND_JIT_EXIT_JITED|ZEND_JIT_EXIT_BLACKLISTED))) {
                opline = (const zend_op*)((uintptr_t)opline & ~(ZEND_JIT_EXIT_JITED|ZEND_JIT_EXIT_BLACKLISTED));

diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c
index 7fcd14feca8c13cb18eeb358d3c76c000707ace6..f8559378c68a688e65f242842214ac22f5a07b00 100644 (file)
--- a/ext/opcache/jit/zend_jit_vm_helpers.c
+++ b/ext/opcache/jit/zend_jit_vm_helpers.c
@@ -814,7 +814,7 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
                                        if ((start & ZEND_JIT_TRACE_START_LOOP) != 0
                                         && level + ret_level == 0
                                         && !zend_jit_trace_bad_compiled_loop(orig_opline)) {
-                                               /* Fail to try close outer loop throgh side exit.
+                                               /* Fail to try close outer loop through side exit.
                                                   If this doesn't work just link. */
                                                stop = ZEND_JIT_TRACE_STOP_COMPILED_LOOP;
                                                break;