From 50a0721f9f16a6609f4a37592779541ede3ba4bd Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Fri, 3 Aug 2018 16:13:27 +1000 Subject: [PATCH] Make scala corpus less cycle prone The compiler from https://github.com/scala/scala/pull/6871 hits a cyclic reference error. https://github.com/scala/scala/pull/6871#issuecomment-410147358 Work around this by adding explicit types. --- .../21d12e9/compiler/scala/tools/reflect/ReflectGlobal.scala | 2 +- .../reflect/scala/reflect/internal/transform/Transforms.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/corpus/scala/21d12e9/compiler/scala/tools/reflect/ReflectGlobal.scala b/corpus/scala/21d12e9/compiler/scala/tools/reflect/ReflectGlobal.scala index b80524d..c32922e 100644 --- a/corpus/scala/21d12e9/compiler/scala/tools/reflect/ReflectGlobal.scala +++ b/corpus/scala/21d12e9/compiler/scala/tools/reflect/ReflectGlobal.scala @@ -27,7 +27,7 @@ class ReflectGlobal(currentSettings: Settings, reporter: Reporter, override val } } - override def transformedType(sym: Symbol) = + override def transformedType(sym: Symbol): Type = postErasure.transformInfo(sym, erasure.transformInfo(sym, uncurry.transformInfo(sym, sym.info))) diff --git a/corpus/scala/21d12e9/reflect/scala/reflect/internal/transform/Transforms.scala b/corpus/scala/21d12e9/reflect/scala/reflect/internal/transform/Transforms.scala index de5bfbd..bb7b192 100644 --- a/corpus/scala/21d12e9/reflect/scala/reflect/internal/transform/Transforms.scala +++ b/corpus/scala/21d12e9/reflect/scala/reflect/internal/transform/Transforms.scala @@ -31,12 +31,12 @@ trait Transforms { self: SymbolTable => def erasure = erasureLazy.force def postErasure = postErasureLazy.force - def transformedType(sym: Symbol) = + def transformedType(sym: Symbol): Type = postErasure.transformInfo(sym, erasure.transformInfo(sym, uncurry.transformInfo(sym, sym.info))) - def transformedType(tpe: Type) = + def transformedType(tpe: Type): Type = postErasure.elimErasedValueType(erasure.scalaErasure(uncurry.uncurry(tpe))) }