Skip to content

Fix other typos in param name/code comments #5502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix other typos in param name/code comments #5502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/zend_gc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ext/opcache/Optimizer/zend_optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,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;
Expand Down
6 changes: 3 additions & 3 deletions ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,7 +2556,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)) {
Expand Down Expand Up @@ -2608,7 +2608,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);
}
}
Expand Down Expand Up @@ -4889,7 +4889,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));
Expand Down
2 changes: 1 addition & 1 deletion ext/opcache/jit/zend_jit_vm_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down