Revert some more now unnecessary changes

Author: nikic

Zend/zend_builtin_functions.c

@@ -2194,7 +2194,6 @@ ZEND_FUNCTION(debug_print_backtrace)
 ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int options, int limit TSRMLS_DC)
 {
 	zend_execute_data *ptr, *skip;
-	zend_function *fbc;
 	int lineno, frameno = 0;
 	const char *function_name;
 	const char *filename;
@@ -2261,15 +2260,14 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 			filename = NULL;
 		}
 
-		fbc = ptr->function_state.function;
-		function_name = fbc->common.function_name;
+		function_name = ptr->function_state.function->common.function_name;
 
 		if (function_name) {
 			add_assoc_string_ex(stack_frame, "function", sizeof("function"), (char*)function_name, 1);
 
 			if (ptr->object && Z_TYPE_P(ptr->object) == IS_OBJECT) {
-				if (fbc->common.scope) {
-					add_assoc_string_ex(stack_frame, "class", sizeof("class"), (char*) fbc->common.scope->name, 1);
+				if (ptr->function_state.function->common.scope) {
+					add_assoc_string_ex(stack_frame, "class", sizeof("class"), (char*)ptr->function_state.function->common.scope->name, 1);
 				} else {
 					zend_uint class_name_len;
 					int dup;
@@ -2284,8 +2282,8 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 				}
 
 				add_assoc_string_ex(stack_frame, "type", sizeof("type"), "->", 1);
-			} else if (fbc->common.scope) {
-				add_assoc_string_ex(stack_frame, "class", sizeof("class"), (char*)fbc->common.scope->name, 1);
+			} else if (ptr->function_state.function->common.scope) {
+				add_assoc_string_ex(stack_frame, "class", sizeof("class"), (char*)ptr->function_state.function->common.scope->name, 1);
 				add_assoc_string_ex(stack_frame, "type", sizeof("type"), "::", 1);
 			}
 

Zend/zend_opcode.c

@@ -651,9 +651,6 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
 {
 	zend_op *opline, *end;
 
-	if( (op_array->fn_flags & ZEND_ACC_DONE_PASS_TWO) ) {
-		return 0;
-	}
 	if (op_array->type != ZEND_USER_FUNCTION && op_array->type != ZEND_EVAL_CODE) {
 		return 0;
 	}