Rename doInline to inlineHint in Attrs

scala-native · Aug 21, 2020 · b080d1a · b080d1a
1 parent 6e5dec2
commit b080d1a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/nir/src/main/scala/scala/scalanative/nir/Attrs.scala b/nir/src/main/scala/scala/scalanative/nir/Attrs.scala
@@ -32,7 +32,7 @@ object Attr {
   final case object Abstract          extends Attr
 }
 
-final case class Attrs(doInline: Inline = MayInline,
+final case class Attrs(inlineHint: Inline = MayInline,
                        specialize: Specialize = MaySpecialize,
                        opt: Opt = UnOpt,
                        isExtern: Boolean = false,
@@ -43,7 +43,7 @@ final case class Attrs(doInline: Inline = MayInline,
   def toSeq: Seq[Attr] = {
     val out = mutable.UnrolledBuffer.empty[Attr]
 
-    if (doInline != MayInline) out += doInline
+    if (inlineHint != MayInline) out += inlineHint
     if (specialize != MaySpecialize) out += specialize
     if (opt != UnOpt) out += opt
     if (isExtern) out += Extern
@@ -59,7 +59,7 @@ object Attrs {
   val None = new Attrs()
 
   def fromSeq(attrs: Seq[Attr]): Attrs = {
-    var inline     = None.doInline
+    var inline     = None.inlineHint
     var specialize = None.specialize
     var opt        = None.opt
     var isExtern   = false

diff --git a/tools/src/main/scala/scala/scalanative/codegen/CodeGen.scala b/tools/src/main/scala/scala/scalanative/codegen/CodeGen.scala
@@ -248,9 +248,9 @@ object CodeGen {
       if (attrs.opt eq Attr.NoOpt) {
         str(" optnone noinline")
       } else {
-        if (attrs.doInline ne Attr.MayInline) {
+        if (attrs.inlineHint ne Attr.MayInline) {
           str(" ")
-          genAttr(attrs.doInline)
+          genAttr(attrs.inlineHint)
         }
       }
       if (!attrs.isExtern && !isDecl) {

diff --git a/tools/src/main/scala/scala/scalanative/codegen/Generate.scala b/tools/src/main/scala/scala/scalanative/codegen/Generate.scala
@@ -68,7 +68,7 @@ object Generate {
       val result           = Val.Local(fresh(), Type.Bool)
 
       buf += Defn.Define(
-        Attrs(doInline = Attr.AlwaysInline),
+        Attrs(inlineHint = Attr.AlwaysInline),
         ClassHasTraitName,
         ClassHasTraitSig,
         Seq(
@@ -99,7 +99,7 @@ object Generate {
       val result          = Val.Local(fresh(), Type.Bool)
 
       buf += Defn.Define(
-        Attrs(doInline = Attr.AlwaysInline),
+        Attrs(inlineHint = Attr.AlwaysInline),
         TraitHasTraitName,
         TraitHasTraitSig,
         Seq(
@@ -223,7 +223,7 @@ object Generate {
             val loadName = name.member(Sig.Generated("load"))
             val loadSig  = Type.Function(Seq(), clsTy)
             val loadDefn = Defn.Define(
-              Attrs(doInline = Attr.NoInline),
+              Attrs(inlineHint = Attr.NoInline),
               loadName,
               loadSig,
               Seq(

diff --git a/tools/src/main/scala/scala/scalanative/interflow/Inline.scala b/tools/src/main/scala/scala/scalanative/interflow/Inline.scala
@@ -35,11 +35,11 @@ trait Inline { self: Interflow =>
         val noOpt =
           defn.attrs.opt == Attr.NoOpt
         val noInline =
-          defn.attrs.doInline == Attr.NoInline
+          defn.attrs.inlineHint == Attr.NoInline
         val alwaysInline =
-          defn.attrs.doInline == Attr.AlwaysInline
+          defn.attrs.inlineHint == Attr.AlwaysInline
         val hintInline =
-          defn.attrs.doInline == Attr.InlineHint
+          defn.attrs.inlineHint == Attr.InlineHint
         val isRecursive =
           hasContext(s"inlining ${name.show}")
         val isBlacklisted =