Maybe fixed a bug which caused SEGFAULT when using gcDo on a -g *.ozf.

Author: kennytm

platform-test/CMakeLists.txt

@@ -33,7 +33,7 @@ endforeach()
 
 # debug folder
 set(DEBUG_FUNCTORS
-    "stacktrace_line_num.oz"
+    "stacktrace_line_num.oz" "gc.oz"
 )
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/debug")
 foreach(FUNCTOR ${DEBUG_FUNCTORS})

platform-test/debug/gc.oz

@@ -0,0 +1,40 @@
+%%%
+%%% Authors:
+%%%   kennytm
+%%%
+%%% Copyright:
+%%%   Kenny Chan, 2014
+%%%
+%%% Last change:
+%%%   $Date$ by $Author$
+%%%   $Revision$
+%%%
+%%% This file is part of Mozart, an implementation
+%%% of Oz 3
+%%%    http://www.mozart-oz.org
+%%%
+%%% See the file "LICENSE" or
+%%%    http://www.mozart-oz.org/LICENSE.html
+%%% for information on usage and redistribution
+%%% of this file, and for a DISCLAIMER OF ALL
+%%% WARRANTIES.
+%%%
+
+functor
+
+import
+    System(gcDo)
+
+export
+    Return
+
+define
+    Return = gcDebug([
+        gcDebugTest(proc {$}
+            {System.gcDo}
+            {System.gcDo}   % <-- should not crash at this point.
+        end)
+    ])
+
+end
+

vm/vm/main/emulate.cc

@@ -75,7 +75,9 @@ DebugEntry::DebugEntry(GR gr, const DebugEntry& from):
 // StackEntry //
 ////////////////
 
-StackEntry::StackEntry(GR gr, StackEntry& from) {
+StackEntry::StackEntry(GR gr, StackEntry& from):
+  debugEntry(gr, from.debugEntry)
+{
   if (from.abstraction == nullptr)
     abstraction = nullptr;
   else
@@ -92,8 +94,6 @@ StackEntry::StackEntry(GR gr, StackEntry& from) {
       gr->copyUnstableNode(yregs[i], from.yregs[i]);
   }
 
-  debugEntry = DebugEntry(gr, from.debugEntry);
-
   // gregs and kregs are irrelevant
 }
 
@@ -373,10 +373,10 @@ void Thread::run() {
         case OpDebugEntry:
         case OpDebugExit: {
           debugEntry.valid = true;
-          debugEntry.file = new (vm) StableNode(vm, KPC(1));
+          debugEntry.file = & KPC(1);
           debugEntry.lineNumber = IntPC(2);
           debugEntry.columnNumber = IntPC(3);
-          debugEntry.kind = new (vm) StableNode(vm, KPC(4));
+          debugEntry.kind = & KPC(4);
           advancePC(4);
           break;
         }