Merge pull request #217 from kennytm/debug-sym-fix

Fix some bugs regarding debugging symbols (ozc -g)

Author: sjrd

lib/compiler/CodeGen.oz

@@ -861,8 +861,7 @@ define
             StateReg = none
          end
          case @toCopy of unit then
-            FormalRegs AllRegs AllRegs2 BodyVInter BodyVInstr GRegs Code VInter
-            Cont1 Cont2
+            FormalRegs AllRegs AllRegs2 BodyVInter GRegs Code Cont1 Cont2
          in
             {CS startDefinition()}
             FormalRegs = {Map @formalArgs
@@ -876,21 +875,16 @@ define
                       elseof Vs then {GetRegs Vs}
                       end
             case StateReg of none then
-               BodyVInstr = BodyVInter
-               VHd0 = VInter
                AllRegs2 = AllRegs
             else
-               BodyVInstr = vSetSelf(_ StateReg BodyVInter)
-               VHd0 = vGetSelf(_ StateReg VInter)
                AllRegs2 = StateReg|AllRegs
             end
-            {CS endDefinition(BodyVInstr FormalRegs AllRegs2 ?GRegs ?Code
+            {CS endDefinition(BodyVInter FormalRegs AllRegs2 ?GRegs ?Code
                               ?OuterNLiveRegs)}
-            VInter = vDefinition(_ {V reg($)} PredId @procedureRef
-                                 GRegs Code VTl0)
+            VHd0 = vDefinition(_ {V reg($)} PredId @procedureRef
+                               GRegs Code VTl0)
          else
-            VInter FormalRegs AllRegs
-            InnerBodyVInter InnerBodyVInstr InnerGRegs InnerCode
+            FormalRegs AllRegs InnerBodyVInter InnerGRegs InnerCode
             InnerDefinitionReg InnerPredId InnerNLiveRegs
             OuterBodyVInstr OuterBodyVInter2 OuterGRegs OuterCode
          in
@@ -905,14 +899,7 @@ define
             AllRegs = case @allVariables of nil then nil
                       elseof Vs then {GetRegs Vs}
                       end
-            case StateReg of none then
-               InnerBodyVInstr = InnerBodyVInter
-               VHd0 = VInter
-            else
-               InnerBodyVInstr = vSetSelf(_ StateReg InnerBodyVInter)
-               VHd0 = vGetSelf(_ StateReg VInter)
-            end
-            {CS endDefinition(InnerBodyVInstr nil AllRegs
+            {CS endDefinition(InnerBodyVInter nil AllRegs
                               ?InnerGRegs ?InnerCode ?InnerNLiveRegs)}
             {CS newReg(?InnerDefinitionReg)}
             InnerPredId = {Adjoin PredId
@@ -964,8 +951,8 @@ define
             OuterBodyVInter2 = vCall(_ InnerDefinitionReg nil unit nil)
             {CS endDefinition(OuterBodyVInstr FormalRegs AllRegs
                               ?OuterGRegs ?OuterCode ?OuterNLiveRegs)}
-            VInter = vDefinition(_ {V reg($)} PredId @procedureRef
-                                 OuterGRegs OuterCode VTl0)
+            VHd0 = vDefinition(_ {V reg($)} PredId @procedureRef
+                               OuterGRegs OuterCode VTl0)
          end
          {StepPoint @coord 'definition' VHd VTl VHd0 VTl0}
          statements <- unit   % hand them to the garbage collector

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
+

platform-test/debug/stacktrace_line_num.oz

@@ -24,11 +24,23 @@ functor
 export
     Return
 define
-    EnsureFailureLineNumber = 29
+    FunctionFailureLineNumber = 31
+    ClassFailureLineNumber = 39
+
     proc {EnsureFailure}
         2 + 2 = 5
     end
 
+    class ClassFailure
+        prop locking
+
+        meth something
+            lock
+                2 + 2 = 5
+            end
+        end
+    end
+
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
     fun {CreateTestCase P LineNumber Key}
@@ -45,8 +57,15 @@ define
             keys: [Key stacktraceLineNum]
         )
     end
+
     Return = stacktraceLineNum([
-        {CreateTestCase EnsureFailure EnsureFailureLineNumber simpleFunctionCall}
+        {CreateTestCase EnsureFailure
+                        FunctionFailureLineNumber
+                        simpleFunctionCall}
+
+        {CreateTestCase (proc {$} _ = {New ClassFailure something} end)
+                        ClassFailureLineNumber
+                        simpleMethodCall}
     ])
 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;
         }