Make isVolatile a SymUtil method.

2 files changed, 4 insertions, 2 deletions

diff --git a/src/dotty/tools/dotc/transform/LazyVals.scala b/src/dotty/tools/dotc/transform/LazyVals.scala
index e85508b8e..bea345a9f 100644
--- a/src/dotty/tools/dotc/transform/LazyVals.scala
+++ b/src/dotty/tools/dotc/transform/LazyVals.scala
@@ -15,6 +15,7 @@ import dotty.tools.dotc.core.Constants.Constant
 import dotty.tools.dotc.core.Types.MethodType
 import dotty.tools.dotc.core.Names.Name
 import dotty.runtime.LazyVals
+import SymUtils._
 import scala.collection.mutable.ListBuffer
 import dotty.tools.dotc.core.Denotations.SingleDenotation
 import dotty.tools.dotc.core.SymDenotations.SymDenotation
@@ -78,10 +79,9 @@ class LazyValTranformContext {
       if (!(tree.mods is Flags.Lazy)) tree
       else {
         val isField = tree.symbol.owner.isClass
-        val isVolatile = tree.symbol.hasAnnotation(defn.VolatileAnnot)
 
         if (isField) {
-          if (isVolatile) transformFieldValDefVolatile(tree)
+          if (tree.symbol.isVolatile) transformFieldValDefVolatile(tree)
           else transformFieldValDefNonVolatile(tree)
         }
         else transformLocalValDef(tree)
diff --git a/src/dotty/tools/dotc/transform/SymUtils.scala b/src/dotty/tools/dotc/transform/SymUtils.scala
index 8a823f751..df0ac59ae 100644
--- a/src/dotty/tools/dotc/transform/SymUtils.scala
+++ b/src/dotty/tools/dotc/transform/SymUtils.scala
@@ -20,4 +20,6 @@ class SymUtils(val self: Symbol) extends AnyVal {
 
   def isTypeTestOrCast(implicit ctx: Context): Boolean =
     self == defn.Any_asInstanceOf || self == defn.Any_isInstanceOf
+
+  def isVolatile(implicit ctx: Context) = self.hasAnnotation(defn.VolatileAnnot)
 }