From 20a9f69af5623e46ce690deeed00b6036e49c151 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 5 Sep 2017 13:15:43 +0200 Subject: [PATCH] Turn off inline --- compiler/src/dotty/tools/dotc/transform/Memoize.scala | 2 +- compiler/src/dotty/tools/dotc/typer/Typer.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala index d9769a1886dc..4f272964a64d 100644 --- a/compiler/src/dotty/tools/dotc/transform/Memoize.scala +++ b/compiler/src/dotty/tools/dotc/transform/Memoize.scala @@ -106,7 +106,7 @@ import Decorators._ def adaptToField(tree: Tree): Tree = if (tree.isEmpty) tree else tree.ensureConforms(field.info.widen) - val NoFieldNeeded = Lazy | Deferred | JavaDefined | (if (ctx.settings.YnoInline.value) EmptyFlags else Inline) + val NoFieldNeeded = Lazy | Deferred | JavaDefined | (if (true) EmptyFlags else Inline) def isErasableBottomField(cls: Symbol): Boolean = { // TODO: For Scala.js, return false if this field is in a js.Object unless it is an ErasedPhantomClass. diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index bd5ff738ff2d..bea2e9e58137 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1279,7 +1279,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit } val sym = vdef.symbol sym.info match { - case info: ConstantType if isFinalInlinableVal(sym) && !ctx.settings.YnoInline.value => sym.setFlag(Inline) + case info: ConstantType if isFinalInlinableVal(sym) && false => sym.setFlag(Inline) case _ => } } @@ -2140,7 +2140,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit checkInlineConformant(tree, "argument to inline parameter") if (Inliner.hasBodyToInline(tree.symbol) && !ctx.owner.ownersIterator.exists(_.isInlineMethod) && - !ctx.settings.YnoInline.value && + false && !ctx.isAfterTyper && !ctx.reporter.hasErrors) adapt(Inliner.inlineCall(tree, pt), pt)