Allow Volatile::extend() to work as expected

classes/threaded.h

@@ -320,7 +320,7 @@ PHP_METHOD(Threaded, extend) {
     if (is_final)
         ce->ce_flags = ce->ce_flags &~ ZEND_ACC_FINAL;
 
-	parent = zend_get_executed_scope();
+	parent = zend_get_called_scope(EG(current_execute_data));
 
 	zend_do_inheritance(ce, parent);
 

tests/runtime-inheritance-volatile.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Test runtime extension of Volatile
+--DESCRIPTION--
+This test verifies that extend() applies the scope it was called in, not executed in
+--FILE--
+<?php
+class Other {}
+
+class Test extends Other {
+    public function one() {}
+}
+
+/* force zend to declare Other extends Volatile */
+Volatile::extend("Other");
+
+$test = new Test();
+
+var_dump($test instanceof Volatile,
+         $test instanceof Other);
+?>
+--EXPECT--
+bool(true)
+bool(true)