Changeset 687

Timestamp:

2009-09-29T16:17:18+02:00 (4 years ago)

Author:

moo

Message:

update op_array->filename for hard link restoring

Location:

trunk

Files:

• processor/processor.m4 (modified) (3 diffs)
• xcache.c (modified) (1 diff)

trunk/processor/processor.m4

@@ -363 +363 @@
     DISPATCH(zend_uint, num_interfaces)
 
-    IFRESTORE(`COPY(filename)', `PROC_STRING(filename)')
+    IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
     DISPATCH(zend_uint, line_start)
     DISPATCH(zend_uint, line_end)
@@ -522 +522 @@
         gc_arg_info = 1;
 #endif
+        IFRESTORE(`dst->filename = processor->entry_src->filepath;')
         if (op_array_info->oplineinfo_cnt) {
             gc_opcodes = 1;
@@ -640 +641 @@
 #endif
 
-    IFRESTORE(`COPY(filename)', `PROC_STRING(filename)')
+    IFRESTORE(`dst->filename = processor->entry_src->filepath;DONE(filename)', `PROC_STRING(filename)')
 #ifdef IS_UNICODE
     IFRESTORE(`

trunk/xcache.c

@@ -1578 +1578 @@
             xce->var##path_len = 0; \
         }
-        if (!const_usage.filepath_used) {
-            xce->filepath = NULL;
-            xce->filepath_len = 0;
-        }
+        /* filepath is required to restore op_array->filename, so no free filepath here */
         X_FREE_UNUSED(dir)
 #ifdef IS_UNICODE