Fix zts build, fix reflection sigsegv, fix issue php#42

No more ai->flags, now merged into prop->flags. I think now the whole ai
thing can be removed. We should just have a zend_function **acc in the
property_info instead.

Author: nikic

Zend/zend_compile.c

@@ -142,7 +142,6 @@ static void zend_duplicate_property_info(zend_property_info *property_info) /* {
 		int i;
 
 		property_info->ai = ecalloc(1, sizeof(zend_accessor_info));
-		property_info->ai->flags = parent_ai->flags;
 
 		for (i = 0; i < ZEND_ACCESSOR_COUNT; ++i) {
 			if (parent_ai->fn[i]) {
@@ -1597,7 +1596,9 @@ void zend_declare_accessor(znode *var_name TSRMLS_DC) { /* {{{ */
 		}
 
 		property_info->ai = ecalloc(1, sizeof(zend_accessor_info));
-		property_info->ai->flags = CG(access_type);
+
+		/* Add back final/abstract flags that were skipped previously */
+		property_info->flags |= CG(access_type);
 
 		CG(current_property_info) = property_info;
 		efree(property_name);
@@ -1626,7 +1627,7 @@ void zend_do_begin_accessor_declaration(znode *function_token, znode *modifiers,
 	/* Inherit property modifiers, allowing to override PPP. This check
 	 * can be improved depending on just what exactly we want to allow
 	 * (this will become important once we support abstract). */
-	property_flags = property_info->ai->flags;
+	property_flags = property_info->flags;
 	if ((Z_LVAL(modifiers->u.constant) & ZEND_ACC_PPP_MASK) != 0) {
 		property_flags &= ~ZEND_ACC_PPP_MASK;
 	}
@@ -4644,7 +4645,6 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
 				if (zend_hash_find(&ce->properties_info, prop_name, prop_name_length+1, (void**) &created_property_info) == SUCCESS) {
 					int j;
 					created_property_info->ai = ecalloc(1, sizeof(zend_accessor_info));
-					created_property_info->ai->flags = property_info->ai->flags;
 
 					for (j = 0; j < ZEND_ACCESSOR_COUNT; ++j) {
 						zend_do_trait_inherit_accessor(&created_property_info->ai->fn[j], property_info->ai->fn[j], ce, ce->traits[i], &overridden TSRMLS_CC);

Zend/zend_compile.h

@@ -380,7 +380,6 @@ typedef union _zend_function {
 } zend_function;
 
 typedef struct _zend_accessor_info {
-	zend_uint flags;
 	zend_function *fn[4];
 } zend_accessor_info;
 

ext/reflection/php_reflection.c

@@ -929,8 +929,8 @@ static void _property_string(string *str, zend_property_info *prop, char *prop_n
 {
 	const char *class_name;
 
-	if(prop->ai) {
-		_property_accessor_string(str, prop, indent);
+	if (prop && prop->ai) {
+		_property_accessor_string(str, prop, indent TSRMLS_CC);
 		return;
 	}
 
@@ -984,7 +984,7 @@ static void _property_accessor_string(string *str, zend_property_info *prop, cha
 		int i;
 
 		/* These are mutually exclusive */
-		switch (ai->flags & ZEND_ACC_PPP_MASK) {
+		switch (prop->flags & ZEND_ACC_PPP_MASK) {
 			case ZEND_ACC_PUBLIC:
 				string_printf(str, "public ");
 				break;
@@ -995,7 +995,7 @@ static void _property_accessor_string(string *str, zend_property_info *prop, cha
 				string_printf(str, "protected ");
 				break;
 		}
-		if (ai->flags & ZEND_ACC_STATIC) {
+		if (prop->flags & ZEND_ACC_STATIC) {
 			string_printf(str, "static ");
 		}
 

ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt

@@ -9,7 +9,7 @@ var_dump($ext->getClasses());
 ?>
 ==DONE==
 --EXPECTF--
-array(14) {
+array(12) {
   ["ReflectionException"]=>
   &object(ReflectionClass)#%d (1) {
     ["name"]=>
@@ -45,11 +45,6 @@ array(14) {
     ["name"]=>
     string(16) "ReflectionMethod"
   }
-  ["ReflectionMethodAccessor"]=>
-  &object(ReflectionClass)#%d (1) {
-    ["name"]=>
-    string(24) "ReflectionMethodAccessor"
-  }
   ["ReflectionClass"]=>
   &object(ReflectionClass)#%d (1) {
     ["name"]=>
@@ -65,11 +60,6 @@ array(14) {
     ["name"]=>
     string(18) "ReflectionProperty"
   }
-  ["ReflectionPropertyAccessor"]=>
-  &object(ReflectionClass)#%d (1) {
-    ["name"]=>
-    string(26) "ReflectionPropertyAccessor"
-  }
   ["ReflectionExtension"]=>
   &object(ReflectionClass)#%d (1) {
     ["name"]=>