dotty.runtime.LazyVals: Fix for 2.12 shifting semantics

smarter · felixmulder · commit 7b757b009ed6 · 2017-08-22T16:05:59.000+02:00
See discussion at https://gitter.im/scala/contributors?at=598b4b3eee5c9a4c5fa61568
diff --git a/library/src/dotty/runtime/LazyVals.scala b/library/src/dotty/runtime/LazyVals.scala
@@ -34,7 +34,7 @@ object LazyVals {
     if (debug)
       println(s"CAS($t, $offset, $e, $v, $ord)")
     val mask = ~(LAZY_VAL_MASK << ord * BITS_PER_LAZY_VAL)
-    val n = (e & mask) | (v << (ord * BITS_PER_LAZY_VAL))
+    val n = (e & mask) | (v.toLong << (ord * BITS_PER_LAZY_VAL))
     compareAndSet(t, offset, e, n)
   }
   @inline def setFlag(t: Object, offset: Long, v: Int, ord: Int) = {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ object LazyVals {`
`34`	`34`	`if (debug)`
`35`	`35`	`println(s"CAS($t, $offset, $e, $v, $ord)")`
`36`	`36`	`val mask = ~(LAZY_VAL_MASK << ord * BITS_PER_LAZY_VAL)`
`37`		`- val n = (e & mask) \| (v << (ord * BITS_PER_LAZY_VAL))`
	`37`	`+ val n = (e & mask) \| (v.toLong << (ord * BITS_PER_LAZY_VAL))`
`38`	`38`	`compareAndSet(t, offset, e, n)`
`39`	`39`	`}`
`40`	`40`	`@inline def setFlag(t: Object, offset: Long, v: Int, ord: Int) = {`