Rebase fixes

Author: DanielEScherzer

Zend/zend_autoload.c

@@ -17,6 +17,7 @@
 */
 
 #include "zend.h"
+#include "zend_class_alias.h"
 #include "zend_API.h"
 #include "zend_autoload.h"
 #include "zend_hash.h"
@@ -44,7 +45,7 @@ static Bucket *autoload_find_registered_function(const HashTable *autoloader_tab
 	return NULL;
 }
 
-ZEND_API zend_class_entry *zend_perform_class_autoload(zend_string *class_name, zend_string *lc_name)
+ZEND_API zval *zend_perform_class_autoload(zend_string *class_name, zend_string *lc_name)
 {
 	if (!zend_class_autoload_functions) {
 		return NULL;
@@ -69,13 +70,17 @@ ZEND_API zend_class_entry *zend_perform_class_autoload(zend_string *class_name,
 		if (EG(exception)) {
 			return NULL;
 		}
-		if (ZSTR_HAS_CE_CACHE(class_name) && ZSTR_GET_CE_CACHE(class_name)) {
-			return (zend_class_entry*)ZSTR_GET_CE_CACHE(class_name);
-		}
-
-		zend_class_entry *ce = zend_hash_find_ptr(EG(class_table), lc_name);
-		if (ce) {
-			return ce;
+		// if (ZSTR_HAS_CE_CACHE(class_name) && ZSTR_GET_CE_CACHE(class_name)) {
+		// 	return (zend_class_entry*)ZSTR_GET_CE_CACHE(class_name);
+		// }
+
+		// zend_class_entry *ce = zend_hash_find_ptr(EG(class_table), lc_name);
+		zval *ce_zv = zend_hash_find(EG(class_table), lc_name);
+		if (ce_zv) {
+			return ce_zv;
+			// zend_class_entry *ce;
+			// Z_CE_FROM_ZVAL_P(ce, ce_zv);
+			// return ce;
 		}
 
 		zend_hash_move_forward_ex(class_autoload_functions, &pos);

Zend/zend_autoload.h

@@ -24,7 +24,7 @@
 #include "zend_API.h"
 #include "zend.h"
 
-ZEND_API zend_class_entry *zend_perform_class_autoload(zend_string *class_name, zend_string *lc_name);
+ZEND_API zval *zend_perform_class_autoload(zend_string *class_name, zend_string *lc_name);
 ZEND_API void zend_autoload_register_class_loader(zend_fcall_info_cache *fcc, bool prepend);
 ZEND_API bool zend_autoload_unregister_class_loader(const zend_fcall_info_cache *fcc);
 ZEND_API void zend_autoload_fcc_map_to_callable_zval_map(zval *return_value);

Zend/zend_execute_API.c

@@ -1265,7 +1265,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
 	zend_long previous_lineno = EG(lineno_override);
 	EG(filename_override) = NULL;
 	EG(lineno_override) = -1;
-	zend_exception_save();
 	zval *ce_zval = zend_autoload(autoload_name, lc_name);
 	zend_class_alias *alias = NULL;
 	if (ce_zval) {
@@ -1277,7 +1276,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
 			ce = Z_PTR_P(ce_zval);
 		}
 	}
-	zend_exception_restore();
 	EG(filename_override) = previous_filename;
 	EG(lineno_override) = previous_lineno;