Add exception check to zend_jit_fetch_obj_w_slow()

This ports 247105a to the JIT implementation. The issue doesn't trigger on the original test case with JIT, but I ran into a case that does trigger with JIT once we have typed properties.
php · Jul 14, 2021 · 6fd8808 · 6fd8808
1 parent 982c833
commit 6fd8808
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -1764,6 +1764,10 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)
 			}
 			return;
 		}
+		if (UNEXPECTED(EG(exception))) {
+			ZVAL_ERROR(result);
+			return;
+		}
 	} else if (UNEXPECTED(Z_ISERROR_P(retval))) {
 		ZVAL_ERROR(result);
 		return;