Skip to content

Fix GH-12953: SSA integrity verification failed when loading composer classmaps with more than 11k elements #12954

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
ndossche wants to merge 1 commit into from
Closed

Fix GH-12953: SSA integrity verification failed when loading composer classmaps with more than 11k elements #12954

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
34 changes: 27 additions & 7 deletions Zend/Optimizer/ssa_integrity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void ssa_verify_integrity(zend_op_array *op_array, zend_ssa *ssa, const char *ex
/* Vars */
for (i = 0; i < ssa->vars_count; i++) {
zend_ssa_var *var = &ssa->vars[i];
int use, c;
int use;
uint32_t type = ssa->var_info[i].type;

if (var->definition < 0 && !var->definition_phi && i > op_array->last_var) {
Expand All @@ -148,23 +148,43 @@ void ssa_verify_integrity(zend_op_array *op_array, zend_ssa *ssa, const char *ex
}
}

c = 0;
FOREACH_USE(var, use) {
if (++c > 10000) {
use = var->use_chain;
int second_use = use;
while (use >= 0 && second_use >= 0) {
use = zend_ssa_next_use(ssa->ops, var - ssa->vars, use);
second_use = zend_ssa_next_use(ssa->ops, var - ssa->vars, second_use);
if (second_use < 0) {
break;
}
second_use = zend_ssa_next_use(ssa->ops, var - ssa->vars, second_use);
if (use == second_use) {
FAIL("cycle in uses of " VARFMT "\n", VAR(i));
goto finish;
}
}

FOREACH_USE(var, use) {
if (!is_used_by_op(ssa, use, i)) {
fprintf(stderr, "var " VARFMT " not in uses of op %d\n", VAR(i), use);
}
} FOREACH_USE_END();

c = 0;
FOREACH_PHI_USE(var, phi) {
if (++c > 10000) {
phi = var->phi_use_chain;
zend_ssa_phi *second_phi = phi;
while (phi && second_phi) {
phi = zend_ssa_next_use_phi(ssa, var - ssa->vars, phi);
second_phi = zend_ssa_next_use_phi(ssa, var - ssa->vars, second_phi);
if (!second_phi) {
break;
}
second_phi = zend_ssa_next_use_phi(ssa, var - ssa->vars, second_phi);
if (phi == second_phi) {
FAIL("cycle in phi uses of " VARFMT "\n", VAR(i));
goto finish;
}
}

FOREACH_PHI_USE(var, phi) {
if (!is_in_phi_sources(ssa, phi, i)) {
FAIL("var " VARFMT " not in phi sources of %d\n", VAR(i), phi->ssa_var);
}
Expand Down