Merge pull request #741 from eed3si9n/bport/thunky

[1.3.x] Fix concurrency issue in SafeLazy

internal/compiler-interface/src/main/java/xsbti/api/SafeLazy.java

@@ -42,30 +42,30 @@ public T get() {
     });
   }
 
-  private static final class Impl<T> extends xsbti.api.AbstractLazy<T> {
-    private Supplier<T> thunk = null;
-    private T result = null;
-
-    Impl(Supplier<T> thunk) {
+  private static final class Thunky<T> {
+    final Supplier<T> thunk;
+    final T result;
+    Thunky(Supplier<T> thunk, T result) {
       this.thunk = thunk;
+      this.result = result;
     }
+  }
 
-    /**
-     * Return cached result or force lazy evaluation.
-     *
-     * Don't call it in a multi-threaded environment.
-     */
-    public synchronized T get() {
-      if (thunk == null) return result;
-      else {
-        result = thunk.get();
+  private static final class Impl<T> extends xsbti.api.AbstractLazy<T> {
+    private Thunky<T> thunky;
 
-        thunk = null; // also allows it to be GC'ed
+    Impl(Supplier<T> thunk) {
+      this.thunky = new Thunky(thunk, null);
+    }
 
-        return result;
+    public T get() {
+      Thunky<T> t = thunky;
+      if (t.result == null) {
+        T r = t.thunk.get();
+        t = new Thunky(null, r);
+        thunky = t;
       }
+      return t.result;
     }
   }
 }
-
-