Merge pull request #8821 from dotty-staging/drop-macro-flag-for-retained-inline

Cleanup uses of Macro flag

Author: liufengyun

compiler/src/dotty/tools/dotc/core/TypeOps.scala

@@ -468,9 +468,6 @@ trait TypeOps { thisCtx: Context => // TODO: Make standalone object.
   /** Are we in an inline method body? */
   def inInlineMethod: Boolean = owner.ownersIterator.exists(_.isInlineMethod)
 
-  /** Are we in a macro? */
-  def inMacro: Boolean = owner.ownersIterator.exists(s => s.isInlineMethod && s.is(Macro))
-
   /** Refine child based on parent
    *
    *  In child class definition, we have:

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -183,7 +183,7 @@ object Inliner {
 
     val retainer = meth.copy(
       name = BodyRetainerName(meth.name),
-      flags = meth.flags &~ (Inline | Override) | Private,
+      flags = meth.flags &~ (Inline | Macro | Override) | Private,
       coord = mdef.rhs.span.startPos).asTerm
     polyDefDef(retainer, targs => prefss =>
       inlineCall(
@@ -1253,7 +1253,6 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       constToLiteral(betaReduce(super.typedApply(tree, pt))) match {
         case res: Apply if res.symbol == defn.InternalQuoted_exprSplice
                         && level == 0
-                        && call.symbol.is(Macro)
                         && !suppressInline =>
           expandMacro(res.args.head, tree.span)
         case res => res