Add exception check to zend_jit_fetch_obj_w_slow()

nikic · nikic · commit 6fd880890ceb · 2021-07-14T16:56:12.000+02:00
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.
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;

Original file line number	Diff line number	Diff line change
`@@ -1764,6 +1764,10 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)`
`1764`	`1764`	`}`
`1765`	`1765`	`return;`
`1766`	`1766`	`}`
	`1767`	`+ if (UNEXPECTED(EG(exception))) {`
	`1768`	`+ ZVAL_ERROR(result);`
	`1769`	`+ return;`
	`1770`	`+ }`
`1767`	`1771`	`} else if (UNEXPECTED(Z_ISERROR_P(retval))) {`
`1768`	`1772`	`ZVAL_ERROR(result);`
`1769`	`1773`	`return;`