Replace naked Read-Modify-Write ops on shared values which will be ba…

…nned.
dlang · Feb 3, 2014 · 2cd03b0 · 2cd03b0
1 parent eeac848
commit 2cd03b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/core/atomic.d b/src/core/atomic.d
@@ -69,7 +69,7 @@ version( CoreDdoc )
      *  The result of the operation.
      */
     HeadUnshared!(T) atomicOp(string op, T, V1)( ref shared T val, V1 mod ) nothrow
-        if( __traits( compiles, mixin( "val" ~ op ~ "mod" ) ) )
+        if( __traits( compiles, mixin( "*cast(T*)&val" ~ op ~ "mod" ) ) )
     {
         return HeadUnshared!(T).init;
     }
@@ -155,7 +155,7 @@ version( CoreDdoc )
 else version( AsmX86_32 )
 {
     HeadUnshared!(T) atomicOp(string op, T, V1)( ref shared T val, V1 mod ) nothrow
-        if( __traits( compiles, mixin( "val" ~ op ~ "mod" ) ) )
+        if( __traits( compiles, mixin( "*cast(T*)&val" ~ op ~ "mod" ) ) )
     in
     {
         // NOTE: 32 bit x86 systems support 8 byte CAS, which only requires
@@ -633,7 +633,7 @@ else version( AsmX86_32 )
 else version( AsmX86_64 )
 {
     HeadUnshared!(T) atomicOp(string op, T, V1)( ref shared T val, V1 mod ) nothrow
-        if( __traits( compiles, mixin( "val" ~ op ~ "mod" ) ) )
+        if( __traits( compiles, mixin( "*cast(T*)&val" ~ op ~ "mod" ) ) )
     in
     {
         // NOTE: 32 bit x86 systems support 8 byte CAS, which only requires

diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -16,6 +16,7 @@ private
     import rt.memory;
     import rt.sections;
     import rt.util.string;
+    import core.atomic;
     import core.stdc.stddef;
     import core.stdc.stdlib;
     import core.stdc.string;
@@ -152,7 +153,7 @@ extern (C) int rt_init()
        initialize different D libraries without knowing about the
        shared druntime. Also we need to attach any thread that calls
        rt_init. */
-    if (_initCount++) return 1;
+    if (atomicOp!"+="(_initCount, 1) > 1) return 1;
 
     _STI_monitor_staticctor();
     _STI_critical_init();
@@ -182,7 +183,7 @@ extern (C) int rt_init()
 extern (C) int rt_term()
 {
     if (!_initCount) return 0; // was never initialized
-    if (--_initCount) return 1;
+    if (atomicOp!"-="(_initCount, 1)) return 1;
 
     try
     {