[pypy-commit] pypy stmgc-c7: Disable the STACK_MARKER here (it's not compatible with the current logic)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r71090:206ffc6cff43
Date: 2014-04-29 15:50 +0200
http://bitbucket.org/pypy/pypy/changeset/206ffc6cff43/

Log:	Disable the STACK_MARKER here (it's not compatible with the current
	logic) until we figure out if it's really necessary.

diff --git a/rpython/translator/stm/src_stm/stmgcintf.c b/rpython/translator/stm/src_stm/stmgcintf.c
--- a/rpython/translator/stm/src_stm/stmgcintf.c
+++ b/rpython/translator/stm/src_stm/stmgcintf.c
@@ -136,7 +136,7 @@
         stm_thread_local.shadowstack;
 #endif
 
-    STM_PUSH_ROOT(stm_thread_local, STM_STACK_MARKER_NEW);
+    //STM_PUSH_ROOT(stm_thread_local, STM_STACK_MARKER_NEW);
     STM_PUSH_ROOT(stm_thread_local, arg);
 
     while (1) {
@@ -168,7 +168,7 @@
 
         /* invoke the callback in the new transaction */
         STM_POP_ROOT(stm_thread_local, arg);
-        assert(v_old_shadowstack == stm_thread_local.shadowstack - 1);
+        assert(v_old_shadowstack == stm_thread_local.shadowstack);// - 1);
         STM_PUSH_ROOT(stm_thread_local, arg);
 
         long result = v_callback(arg, counter);
@@ -204,8 +204,8 @@
     }
 
     STM_POP_ROOT_RET(stm_thread_local);             /* pop the 'arg' */
-    uintptr_t x = (uintptr_t)STM_POP_ROOT_RET(stm_thread_local);
-    assert(x == STM_STACK_MARKER_NEW || x == STM_STACK_MARKER_OLD);
+    //uintptr_t x = (uintptr_t)STM_POP_ROOT_RET(stm_thread_local);
+    //assert(x == STM_STACK_MARKER_NEW || x == STM_STACK_MARKER_OLD);
     assert(v_old_shadowstack == stm_thread_local.shadowstack);
 }