Backport #1741 from the upstream

Fixed "create_symbol_table" for ZendEngine3
zephir-lang · Nov 18, 2018 · 53e1938 · 53e1938
1 parent 50907cb
commit 53e1938
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 8 deletions.
diff --git a/kernels/ZendEngine3/memory.c b/kernels/ZendEngine3/memory.c
@@ -45,6 +45,16 @@
  * Not all methods must grow/restore the zephir_memory_entry.
  */
 
+static zend_always_inline zend_execute_data*
+find_symbol_table(zend_execute_data* ex)
+{
+    while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->common.type))) {
+        ex = ex->prev_execute_data;
+    }
+
+    return ex;
+}
+
 static zephir_memory_entry* zephir_memory_grow_stack_common(zend_zephir_globals_def *g)
 {
 	assert(g->start_memory != NULL);
@@ -102,8 +112,14 @@ static void zephir_memory_restore_stack_common(zend_zephir_globals_def *g)
 		if (g->active_symbol_table) {
 			active_symbol_table = g->active_symbol_table;
 			while (active_symbol_table && active_symbol_table->scope == active_memory) {
-				zend_execute_data *ex = EG(current_execute_data);
-
+				zend_execute_data *ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+				if (UNEXPECTED(!ex)) {
+					fprintf(stderr, "ERROR: unable to find a symbol table");
+					zephir_print_backtrace();
+					return;
+				}
+#endif
 				zend_hash_destroy(ex->symbol_table);
 				efree(ex->symbol_table);
 				ex->symbol_table = active_symbol_table->symbol_table;
@@ -387,7 +403,6 @@ void zephir_create_symbol_table()
 {
 	zephir_symbol_table *entry;
 	zend_zephir_globals_def *gptr = ZEPHIR_VGLOBAL;
-	zend_execute_data *ex = EG(current_execute_data);
 	zend_array *symbol_table;
 
 #ifndef ZEPHIR_RELEASE
@@ -398,6 +413,15 @@ void zephir_create_symbol_table()
 	}
 #endif
 
+	zend_execute_data* ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+    if (UNEXPECTED(!ex)) {
+        fprintf(stderr, "ERROR: unable to find a symbol table");
+        zephir_print_backtrace();
+        return;
+    }
+#endif
+
 	zend_rebuild_symbol_table();
 	zend_detach_symbol_table(ex);
 

diff --git a/test/requires.zep b/test/requires.zep
@@ -22,9 +22,7 @@ class Requires
 	{
 		var external3;
 
-		if PHP_MAJOR_VERSION == 5 {
-			create_symbol_table();
-		}
+		create_symbol_table();
 
 		let external3 = new External3();
 		external3->req(path, this);
@@ -35,4 +33,19 @@ class Requires
 	{
 		let this->content = content;
 	}
+
+	public function renderTemplate(string! templatePath, var params) -> var
+	{
+		create_symbol_table();
+
+		var key, value;
+
+		if typeof params == "array" {
+			for key, value in params {
+				let {key} = value;
+			}
+		}
+
+		return require templatePath;
+	}
 }
diff --git a/unit-tests/Extension/Oo/ExtendClassTest.php b/unit-tests/Extension/Oo/ExtendClassTest.php
@@ -22,7 +22,7 @@ class ExtendClassTest extends \PHPUnit_Framework_TestCase
     public function testPDOExtending()
     {
         if (!extension_loaded('pdo')) {
-            $this->markTestSkipped('The PDO extendsion is not loaded');
+            $this->markTestSkipped('The PDO extension is not loaded');
         }
         $this->assertSame(PDO::getAvailableDrivers(), ExtendPdoClass::getAvailableDrivers());
         $this->assertSame(PDO::PARAM_STR, ExtendPdoClass::PARAM_STR);

diff --git a/unit-tests/Extension/RequiresTest.php b/unit-tests/Extension/RequiresTest.php
@@ -30,7 +30,11 @@ public function testRequireExternal1()
         $this->assertTrue(defined('REQUIRE_ME'));
     }
 
-    public function testRequireExternal3()
+    /**
+     * @test
+     * @issue https://github.com/phalcon/zephir/pull/1428
+     */
+    public function shouldRequireUsingNewSymbolTable()
     {
         $r = new Requires();
 
@@ -40,6 +44,23 @@ public function testRequireExternal3()
         );
     }
 
+    /**
+     * @test
+     * @issue https://github.com/phalcon/zephir/issues/1621
+     */
+    public function shouldRenderTemplate()
+    {
+        $r = new Requires();
+        $a = 1;
+
+        $this->assertEquals(
+            2,
+            $r->renderTemplate(__DIR__ . '/../fixtures/template.php', ['a' => 2])
+        );
+
+        $this->assertEquals(1, $a);
+    }
+
     /**
      * @test
      * @issue https://github.com/phalcon/zephir/issues/1713

diff --git a/unit-tests/fixtures/template.php b/unit-tests/fixtures/template.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Zephir Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return $a;