bug78903-02.diff

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8feb13955d..f3931c1a90 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5924,8 +5924,15 @@ static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_as
 		return;
 	}
 
-	key = zend_build_runtime_definition_key(lcname, decl->lex_pos);
-	zend_hash_update_ptr(CG(function_table), key, op_array);
+	key = zend_build_runtime_definition_key(lcname, (unsigned char*)(decl->lex_pos - LANG_SCNG(yy_start)));
+	if (UNEXPECTED(!zend_hash_add_ptr(CG(function_table), key, op_array))) {
+		zval *zv = zend_hash_find(CG(function_table), key);
+		zend_string *new_key = zend_build_runtime_definition_key(lcname, (unsigned char*)Z_PTR_P(zv));
+
+		zend_hash_set_bucket_key(EG(function_table), (Bucket*)zv, new_key);
+		zend_string_release(new_key);
+		zend_hash_add_new_ptr(CG(function_table), key, op_array);
+	}
 
 	if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
 		opline = zend_emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL);
@@ -6562,7 +6569,7 @@ zend_op *zend_compile_class_decl(zend_ast *ast, zend_bool toplevel) /* {{{ */
 			return opline;
 		}
 	} else {
-		zend_string *key = zend_build_runtime_definition_key(lcname, decl->lex_pos);
+		zend_string *key = zend_build_runtime_definition_key(lcname, (unsigned char*)(decl->lex_pos - LANG_SCNG(yy_start)));
 
 		/* RTD key is placed after lcname literal in op1 */
 		zend_add_literal_string(&key);