From 851247b67817bf7f5cc8d8af379c4952c892ba1a Mon Sep 17 00:00:00 2001 From: Tobias Schlatter Date: Tue, 23 Feb 2021 17:22:59 +0100 Subject: [PATCH 1/2] Remove unused pos parameter from LocalDef --- .../org/scalajs/linker/checker/IRChecker.scala | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala b/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala index e419a29c83..7d702df2ec 100644 --- a/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala +++ b/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala @@ -618,7 +618,7 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) { case VarDef(ident, _, vtpe, mutable, rhs) => checkDeclareLocalVar(ident) typecheckExpect(rhs, env, vtpe) - env.withLocal(LocalDef(ident.name, vtpe, mutable)(tree.pos)) + env.withLocal(LocalDef(ident.name, vtpe, mutable)) case Skip() => env @@ -696,15 +696,13 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) { case ForIn(obj, keyVar, _, body) => typecheckExpr(obj, env) - val bodyEnv = - env.withLocal(LocalDef(keyVar.name, AnyType, false)(keyVar.pos)) + val bodyEnv = env.withLocal(LocalDef(keyVar.name, AnyType, false)) typecheckStat(body, bodyEnv) env case TryCatch(block, errVar, _, handler) => typecheckStat(block, env) - val handlerEnv = - env.withLocal(LocalDef(errVar.name, AnyType, false)(errVar.pos)) + val handlerEnv = env.withLocal(LocalDef(errVar.name, AnyType, false)) typecheckStat(handler, handlerEnv) env @@ -811,7 +809,7 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) { val tpe = tree.tpe typecheckExpect(block, env, tpe) val handlerEnv = - env.withLocal(LocalDef(errVar.name, AnyType, false)(errVar.pos)) + env.withLocal(LocalDef(errVar.name, AnyType, false)) typecheckExpect(handler, handlerEnv, tpe) case TryFinally(block, finalizer) => @@ -1390,7 +1388,7 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) { val allParams = jsClassCaptures.getOrElse(Nil) ::: params val paramLocalDefs = for (p @ ParamDef(ident, _, tpe, mutable) <- allParams) - yield ident.name -> LocalDef(ident.name, tpe, mutable)(p.pos) + yield ident.name -> LocalDef(ident.name, tpe, mutable) new Env(thisType, paramLocalDefs.toMap, Map.empty, inConstructorOf) } } @@ -1514,7 +1512,5 @@ object IRChecker { new ErrorContext(linkedClass) } - private final case class LocalDef(name: LocalName, tpe: Type, - mutable: Boolean)( - val pos: Position) + private final case class LocalDef(name: LocalName, tpe: Type, mutable: Boolean) } From 0419aa3911bca86227f7fbef4635ee650ecc9503 Mon Sep 17 00:00:00 2001 From: Tobias Schlatter Date: Thu, 25 Feb 2021 08:18:06 +0100 Subject: [PATCH 2/2] Remove unused ErrorContext parameter --- .../src/main/scala/org/scalajs/linker/checker/IRChecker.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala b/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala index 7d702df2ec..c620514753 100644 --- a/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala +++ b/linker/shared/src/main/scala/org/scalajs/linker/checker/IRChecker.scala @@ -1370,7 +1370,7 @@ private final class IRChecker(unit: LinkingUnit, logger: Logger) { def withThis(thisTpe: Type): Env = new Env(thisTpe, this.locals, this.returnTypes, this.inConstructorOf) - def withLocal(localDef: LocalDef)(implicit ctx: ErrorContext): Env = { + def withLocal(localDef: LocalDef): Env = { new Env(thisTpe, locals + (localDef.name -> localDef), returnTypes, this.inConstructorOf) }