Merge d9b10c47f14c77c50dc04adb2fd81a39e814c0a8 into 2fa14c588463bf576bce766f6ae996e7e8e10271

This commit is contained in:
killcerr 2026-01-30 17:14:41 +08:00 committed by GitHub
commit 9b854e0373
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1142,8 +1142,21 @@ __NEXT_STEP:
DISPATCH();
}
case OP_EXCEPTION_MATCH: {
if(!py_checktype(TOP(), tp_type)) goto __ERROR;
bool ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
bool ok = false;
if(TOP()->type == tp_type) {
ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
} else if(TOP()->type == tp_tuple) {
int len = py_tuple_len(TOP());
py_ObjectRef data = py_tuple_data(TOP());
for(int i = 0; i < len; i++) {
if(!py_checktype(data + i, tp_type)) goto __ERROR;
if(py_isinstance(&self->unhandled_exc, py_totype(data + i))) {
ok = true;
break;
}
}
} else
goto __ERROR;
py_newbool(TOP(), ok);
DISPATCH();
}