Fix zephir-lang#1851 (zephir-lang#1862)

* Fix zephir-lang#1851 * Generate c code * Updated * Update FcallTest.php
dreamsxin · Nov 6, 2019 · 81b7f45 · 81b7f45
1 parent ad8f061
commit 81b7f45
Show file tree

Hide file tree

Showing 126 changed files with 410 additions and 122 deletions.
diff --git a/ext/config.m4 b/ext/config.m4
@@ -192,7 +192,8 @@ if test "$PHP_TEST" = "yes"; then
 	test/7__closure.zep.c
 	test/8__closure.zep.c
 	test/9__closure.zep.c
-	test/10__closure.zep.c "
+	test/10__closure.zep.c
+	test/11__closure.zep.c "
 	PHP_NEW_EXTENSION(test, $test_sources, $ext_shared,, )
 	PHP_SUBST(TEST_SHARED_LIBADD)
 

diff --git a/ext/config.w32 b/ext/config.w32
@@ -10,7 +10,7 @@ if (PHP_TEST != "no") {
     AC_DEFINE("ZEPHIR_USE_PHP_JSON", 1, "Whether PHP json extension is present at compile time");
   }
 
-  ADD_SOURCES(configure_module_dirname + "/test", "testinterface.zep.c scallparent.zep.c constantsparent.zep.c methodinterface.zep.c arithmetic.zep.c arrayaccessobj.zep.c arrayaccesstest.zep.c arrayiterator.zep.c arrayiteratortest.zep.c arrayobject.zep.c arraysearch.zep.c assign.zep.c bitwise.zep.c branchprediction.zep.c cast.zep.c cblock.zep.c chars.zep.c closures.zep.c compare.zep.c concat.zep.c constants.zep.c constantsinterface.zep.c constantsinterfacea.zep.c constantsinterfaceb.zep.c declaretest.zep.c diinterface.zep.c echoes.zep.c emptytest.zep.c evaltest.zep.c exception.zep.c exceptions.zep.c exists.zep.c exitdie.zep.c extendedinterface.zep.c factorial.zep.c fannkuch.zep.c fasta.zep.c fcall.zep.c fetchtest.zep.c fibonnaci.zep.c flow.zep.c fortytwo.zep.c functional.zep.c functionexists.zep.c geometry.zep.c globals.zep.c instance.zep.c instanceoff.zep.c internalclasses.zep.c internalinterfaces.zep.c invoke.zep.c issettest.zep.c issue1404.zep.c issue1521.zep.c issues.zep.c json.zep.c logical.zep.c mcall.zep.c mcallchained.zep.c mcalldynamic.zep.c mcallinternal.zep.c methodabstract.zep.c methodargs.zep.c nativearray.zep.c oo.zep.c operator.zep.c pdostatement.zep.c pregmatch.zep.c quantum.zep.c range.zep.c references.zep.c regexdna.zep.c requires.zep.c resourcetest.zep.c returns.zep.c router.zep.c scall.zep.c scalldynamic.zep.c scallexternal.zep.c scope.zep.c sort.zep.c spectralnorm.zep.c spropertyaccess.zep.c statements.zep.c strings.zep.c stubs.zep.c ternary.zep.c trytest.zep.c typeinstances.zep.c typeoff.zep.c unknownclass.zep.c unsettest.zep.c usetest.zep.c vars.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c", "test");
+  ADD_SOURCES(configure_module_dirname + "/test", "testinterface.zep.c scallparent.zep.c constantsparent.zep.c methodinterface.zep.c arithmetic.zep.c arrayaccessobj.zep.c arrayaccesstest.zep.c arrayiterator.zep.c arrayiteratortest.zep.c arrayobject.zep.c arraysearch.zep.c assign.zep.c bitwise.zep.c branchprediction.zep.c cast.zep.c cblock.zep.c chars.zep.c closures.zep.c compare.zep.c concat.zep.c constants.zep.c constantsinterface.zep.c constantsinterfacea.zep.c constantsinterfaceb.zep.c declaretest.zep.c diinterface.zep.c echoes.zep.c emptytest.zep.c evaltest.zep.c exception.zep.c exceptions.zep.c exists.zep.c exitdie.zep.c extendedinterface.zep.c factorial.zep.c fannkuch.zep.c fasta.zep.c fcall.zep.c fetchtest.zep.c fibonnaci.zep.c flow.zep.c fortytwo.zep.c functional.zep.c functionexists.zep.c geometry.zep.c globals.zep.c instance.zep.c instanceoff.zep.c internalclasses.zep.c internalinterfaces.zep.c invoke.zep.c issettest.zep.c issue1404.zep.c issue1521.zep.c issues.zep.c json.zep.c logical.zep.c mcall.zep.c mcallchained.zep.c mcalldynamic.zep.c mcallinternal.zep.c methodabstract.zep.c methodargs.zep.c nativearray.zep.c oo.zep.c operator.zep.c pdostatement.zep.c pregmatch.zep.c quantum.zep.c range.zep.c references.zep.c regexdna.zep.c requires.zep.c resourcetest.zep.c returns.zep.c router.zep.c scall.zep.c scalldynamic.zep.c scallexternal.zep.c scope.zep.c sort.zep.c spectralnorm.zep.c spropertyaccess.zep.c statements.zep.c strings.zep.c stubs.zep.c ternary.zep.c trytest.zep.c typeinstances.zep.c typeoff.zep.c unknownclass.zep.c unsettest.zep.c usetest.zep.c vars.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c", "test");
 	ADD_SOURCES(configure_module_dirname + "/test/oo/extend", "exception.zep.c", "test");
 	ADD_SOURCES(configure_module_dirname + "/test/oo/extend/db", "exception.zep.c", "test");
 	ADD_SOURCES(configure_module_dirname + "/test/globals/session", "base.zep.c child.zep.c", "test");

diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
@@ -421,6 +421,8 @@ int zephir_call_user_function(zval *object_pp, zend_class_entry *obj_ce, zephir_
 	}
 	else if (FAILURE == status || EG(exception)) {
 		ZVAL_NULL(retval_ptr);
+	} else if (Z_TYPE_P(retval_ptr) == IS_ARRAY) {
+		SEPARATE_ARRAY(retval_ptr);
 	}
 
 	return status;

diff --git a/ext/kernel/object.c b/ext/kernel/object.c
@@ -436,15 +436,16 @@ int zephir_read_property(zval *result, zval *object, const char *property_name,
 
 	ce = Z_OBJCE_P(object);
 
+	if (ce->parent) {
+		ce = zephir_lookup_class_ce(ce, property_name, property_length);
+	}
+
 #if PHP_VERSION_ID >= 70100
 	old_scope = EG(fake_scope);
 	EG(fake_scope) = ce;
 #else
 	old_scope = EG(scope);
 	EG(scope) = ce;
-	if (ce->parent) {
-		ce = zephir_lookup_class_ce(ce, property_name, property_length);
-	}
 #endif
 
 	if (!Z_OBJ_HT_P(object)->read_property) {
@@ -570,6 +571,17 @@ int zephir_update_property_zval(zval *object, const char *property_name, unsigne
 
 	ZVAL_STRINGL(&property, property_name, property_length);
 
+	if (Z_TYPE_P(value) == IS_ARRAY) {
+		if (EXPECTED(!(GC_FLAGS(Z_ARRVAL_P(value)) & IS_ARRAY_IMMUTABLE))) {
+			if (UNEXPECTED(GC_REFCOUNT(Z_ARR_P(value)) > 1)) {
+				if (Z_REFCOUNTED_P(value)) {
+					GC_DELREF(Z_ARR_P(value));
+				}
+			}
+		}
+		ZVAL_ARR(value, zend_array_dup(Z_ARR_P(value)));
+	}
+
 	/* write_property will add 1 to refcount, so no Z_TRY_ADDREF_P(value); is necessary */
 	Z_OBJ_HT_P(object)->write_property(object, &property, value, 0);
 	zval_ptr_dtor(&property);

diff --git a/ext/php_test.h b/ext/php_test.h
@@ -14,7 +14,7 @@
 #define PHP_TEST_VERSION     "1.0.0"
 #define PHP_TEST_EXTNAME     "test"
 #define PHP_TEST_AUTHOR      "Zephir Team and contributors"
-#define PHP_TEST_ZEPVERSION  "0.11.11-$Id$"
+#define PHP_TEST_ZEPVERSION  "0.12.0-$Id$"
 #define PHP_TEST_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db { 

diff --git a/ext/test.c b/ext/test.c
@@ -43,6 +43,7 @@ zend_class_entry *test_oo_scopes_hasprivatemethod_ce;
 zend_class_entry *test_properties_publicproperties_ce;
 zend_class_entry *test_0__closure_ce;
 zend_class_entry *test_10__closure_ce;
+zend_class_entry *test_11__closure_ce;
 zend_class_entry *test_1__closure_ce;
 zend_class_entry *test_2__closure_ce;
 zend_class_entry *test_3__closure_ce;
@@ -400,6 +401,7 @@ static PHP_MINIT_FUNCTION(test)
 	ZEPHIR_INIT(Test_Vars);
 	ZEPHIR_INIT(test_0__closure);
 	ZEPHIR_INIT(test_10__closure);
+	ZEPHIR_INIT(test_11__closure);
 	ZEPHIR_INIT(test_1__closure);
 	ZEPHIR_INIT(test_2__closure);
 	ZEPHIR_INIT(test_3__closure);

diff --git a/ext/test.h b/ext/test.h
@@ -188,5 +188,6 @@
 #include "test/8__closure.zep.h"
 #include "test/9__closure.zep.h"
 #include "test/10__closure.zep.h"
+#include "test/11__closure.zep.h"
 
 #endif
diff --git a/ext/test/0__closure.zep.c b/ext/test/0__closure.zep.c
diff --git a/ext/test/10__closure.zep.c b/ext/test/10__closure.zep.c
diff --git a/ext/test/1__closure.zep.c b/ext/test/1__closure.zep.c
diff --git a/ext/test/2__closure.zep.c b/ext/test/2__closure.zep.c
diff --git a/ext/test/3__closure.zep.c b/ext/test/3__closure.zep.c
diff --git a/ext/test/4__closure.zep.c b/ext/test/4__closure.zep.c
diff --git a/ext/test/5__closure.zep.c b/ext/test/5__closure.zep.c
diff --git a/ext/test/6__closure.zep.c b/ext/test/6__closure.zep.c
diff --git a/ext/test/7__closure.zep.c b/ext/test/7__closure.zep.c
diff --git a/ext/test/8__closure.zep.c b/ext/test/8__closure.zep.c
diff --git a/ext/test/8__closure.zep.h b/ext/test/8__closure.zep.h
diff --git a/ext/test/9__closure.zep.c b/ext/test/9__closure.zep.c
diff --git a/ext/test/9__closure.zep.h b/ext/test/9__closure.zep.h
diff --git a/ext/test/arithmetic.zep.c b/ext/test/arithmetic.zep.c
diff --git a/ext/test/arrayaccesstest.zep.c b/ext/test/arrayaccesstest.zep.c
diff --git a/ext/test/arrayiteratortest.zep.c b/ext/test/arrayiteratortest.zep.c
diff --git a/ext/test/arraysearch.zep.c b/ext/test/arraysearch.zep.c
diff --git a/ext/test/bitwise.zep.c b/ext/test/bitwise.zep.c
diff --git a/ext/test/branchprediction.zep.c b/ext/test/branchprediction.zep.c
diff --git a/ext/test/builtin/arraymethods.zep.c b/ext/test/builtin/arraymethods.zep.c
diff --git a/ext/test/builtin/charmethods.zep.c b/ext/test/builtin/charmethods.zep.c
diff --git a/ext/test/builtin/intmethods.zep.c b/ext/test/builtin/intmethods.zep.c
diff --git a/ext/test/builtin/stringmethods.zep.c b/ext/test/builtin/stringmethods.zep.c
diff --git a/ext/test/cast.zep.c b/ext/test/cast.zep.c
diff --git a/ext/test/cblock.zep.c b/ext/test/cblock.zep.c
diff --git a/ext/test/chars.zep.c b/ext/test/chars.zep.c