fix #35499, inconsistent atomic ops on int vs. float (#35509)

JuliaLang · Apr 18, 2020 · 48cd02a · 48cd02a · nanosoldier · Apr 19, 2020
1 parent e00db7b
commit 48cd02a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/base/atomics.jl b/base/atomics.jl
@@ -422,7 +422,7 @@ for op in [:+, :-, :max, :min]
  new = $op(old, val)
  cmp = old
  old = atomic_cas!(var, cmp, new)
- reinterpret(IT, old) == reinterpret(IT, cmp) && return new
+ reinterpret(IT, old) == reinterpret(IT, cmp) && return old
  # Temporary solution before we have gc transition support in codegen.
  ccall(:jl_gc_safepoint, Cvoid, ())
  end

diff --git a/test/threads_exec.jl b/test/threads_exec.jl
@@ -411,7 +411,7 @@ function test_atomic_float(varadd::Atomic{T}, varmax::Atomic{T}, varmin::Atomic{
  atomic_max!(varmax, T(i))
  atomic_min!(varmin, T(i))
 end
-for T in (Int32, Int64, Float32, Float64)
+for T in (Int32, Int64, Float16, Float32, Float64)
  varadd = Atomic{T}()
  varmax = Atomic{T}()
  varmin = Atomic{T}()
@@ -422,6 +422,10 @@ for T in (Int32, Int64, Float32, Float64)
  @test varadd[] === T(sum(1:nloops))
  @test varmax[] === T(maximum(1:nloops))
  @test varmin[] === T(0)
+ @test atomic_add!(Atomic{T}(1), T(2)) == 1
+ @test atomic_sub!(Atomic{T}(2), T(3)) == 2
+ @test atomic_min!(Atomic{T}(4), T(3)) == 4
+ @test atomic_max!(Atomic{T}(5), T(6)) == 5
 end
 
 using Dates