From 04d4351e30db2180d31bc427bef684572a1b5831 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Dec 2016 16:05:02 +0300 Subject: [PATCH] Revert "Make Ref fields volatile" This reverts commit 6b348bfc6e22c8a618fd84395046451c8b1ad1c2. For more information, see https://discuss.kotlinlang.org/t/non-volatile-vs-volatile-captured-refs-by-default/ #KT-14746 In Progress --- .../src/kotlin/jvm/internal/Ref.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java b/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java index dcbcf83770b..c29942db0ce 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java @@ -20,7 +20,7 @@ public class Ref { private Ref() {} public static final class ObjectRef { - public volatile T element; + public T element; @Override public String toString() { @@ -29,7 +29,7 @@ public class Ref { } public static final class ByteRef { - public volatile byte element; + public byte element; @Override public String toString() { @@ -38,7 +38,7 @@ public class Ref { } public static final class ShortRef { - public volatile short element; + public short element; @Override public String toString() { @@ -47,7 +47,7 @@ public class Ref { } public static final class IntRef { - public volatile int element; + public int element; @Override public String toString() { @@ -56,7 +56,7 @@ public class Ref { } public static final class LongRef { - public volatile long element; + public long element; @Override public String toString() { @@ -65,7 +65,7 @@ public class Ref { } public static final class FloatRef { - public volatile float element; + public float element; @Override public String toString() { @@ -74,7 +74,7 @@ public class Ref { } public static final class DoubleRef { - public volatile double element; + public double element; @Override public String toString() { @@ -83,7 +83,7 @@ public class Ref { } public static final class CharRef { - public volatile char element; + public char element; @Override public String toString() { @@ -92,7 +92,7 @@ public class Ref { } public static final class BooleanRef { - public volatile boolean element; + public boolean element; @Override public String toString() {