diff --git a/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/src/dotty/tools/dotc/transform/ExtensionMethods.scala index 9c7b7ebda5cc..ef0faae809d4 100644 --- a/src/dotty/tools/dotc/transform/ExtensionMethods.scala +++ b/src/dotty/tools/dotc/transform/ExtensionMethods.scala @@ -88,11 +88,11 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful decls1.enter(evt2uSym) } - // add a VCXXXCompanion superclass - + // Add the extension methods, the cast methods u2evt$ and evt2u$, and a VC*Companion superclass moduleClassSym.copySymDenotation(info = cinfo.derivedClassInfo( - classParents = ctx.normalizeToClassRefs(List(newSuperClass), moduleSym, decls1), + // FIXME: use of VC*Companion superclasses is disabled until the conflicts with SyntheticMethods are solved. + //classParents = ctx.normalizeToClassRefs(List(newSuperClass), moduleSym, decls1), decls = decls1)) case _ => moduleClassSym diff --git a/tests/pending/run/t6260-delambdafy.check b/tests/pending/run/t6260-delambdafy.check deleted file mode 100644 index b2a7bed98890..000000000000 --- a/tests/pending/run/t6260-delambdafy.check +++ /dev/null @@ -1,4 +0,0 @@ -f(C@2e) - -Test$lambda$1$$apply -apply diff --git a/tests/pending/run/t6260-delambdafy.flags b/tests/pending/run/t6260-delambdafy.flags deleted file mode 100644 index 48b438ddf86a..000000000000 --- a/tests/pending/run/t6260-delambdafy.flags +++ /dev/null @@ -1 +0,0 @@ --Ydelambdafy:method diff --git a/tests/pending/run/genericValueClass.check b/tests/run/genericValueClass.check similarity index 100% rename from tests/pending/run/genericValueClass.check rename to tests/run/genericValueClass.check diff --git a/tests/pending/run/genericValueClass.scala b/tests/run/genericValueClass.scala similarity index 100% rename from tests/pending/run/genericValueClass.scala rename to tests/run/genericValueClass.scala diff --git a/tests/pending/run/t5608.check b/tests/run/t5608.check similarity index 100% rename from tests/pending/run/t5608.check rename to tests/run/t5608.check diff --git a/tests/pending/run/t5608.scala b/tests/run/t5608.scala similarity index 100% rename from tests/pending/run/t5608.scala rename to tests/run/t5608.scala diff --git a/tests/pending/run/t5866.check b/tests/run/t5866.check similarity index 100% rename from tests/pending/run/t5866.check rename to tests/run/t5866.check diff --git a/tests/pending/run/t5866.scala b/tests/run/t5866.scala similarity index 100% rename from tests/pending/run/t5866.scala rename to tests/run/t5866.scala diff --git a/tests/run/t6260-delambdafy.check b/tests/run/t6260-delambdafy.check new file mode 100644 index 000000000000..b3ec1b3cc667 --- /dev/null +++ b/tests/run/t6260-delambdafy.check @@ -0,0 +1,4 @@ +f(C@2e) + +apply +get$Lambda diff --git a/tests/pending/run/t6260-delambdafy.scala b/tests/run/t6260-delambdafy.scala similarity index 100% rename from tests/pending/run/t6260-delambdafy.scala rename to tests/run/t6260-delambdafy.scala diff --git a/tests/pending/run/t6260.check b/tests/run/t6260.check similarity index 100% rename from tests/pending/run/t6260.check rename to tests/run/t6260.check diff --git a/tests/pending/run/t6260.scala b/tests/run/t6260.scala similarity index 100% rename from tests/pending/run/t6260.scala rename to tests/run/t6260.scala diff --git a/tests/pending/run/t6534.scala b/tests/run/t6534.scala similarity index 100% rename from tests/pending/run/t6534.scala rename to tests/run/t6534.scala diff --git a/tests/pending/run/t6574b.check b/tests/run/t6574b.check similarity index 100% rename from tests/pending/run/t6574b.check rename to tests/run/t6574b.check diff --git a/tests/pending/run/t6574b.scala b/tests/run/t6574b.scala similarity index 100% rename from tests/pending/run/t6574b.scala rename to tests/run/t6574b.scala diff --git a/tests/pending/run/t7019.scala b/tests/run/t7019.scala similarity index 100% rename from tests/pending/run/t7019.scala rename to tests/run/t7019.scala diff --git a/tests/pending/run/value-class-extractor-2.check b/tests/run/value-class-extractor-2.check similarity index 100% rename from tests/pending/run/value-class-extractor-2.check rename to tests/run/value-class-extractor-2.check diff --git a/tests/pending/run/value-class-extractor-2.scala b/tests/run/value-class-extractor-2.scala similarity index 99% rename from tests/pending/run/value-class-extractor-2.scala rename to tests/run/value-class-extractor-2.scala index d776c35edacc..5850d42f037e 100644 --- a/tests/pending/run/value-class-extractor-2.scala +++ b/tests/run/value-class-extractor-2.scala @@ -1,6 +1,7 @@ final class Opt[+A >: Null](val value: A) extends AnyVal { def get: A = value def isEmpty = value == null + def isDefined = !isEmpty } object Opt { final val None = new Opt[Null](null) diff --git a/tests/pending/run/value-class-extractor.check b/tests/run/value-class-extractor.check similarity index 100% rename from tests/pending/run/value-class-extractor.check rename to tests/run/value-class-extractor.check diff --git a/tests/pending/run/value-class-extractor.scala b/tests/run/value-class-extractor.scala similarity index 96% rename from tests/pending/run/value-class-extractor.scala rename to tests/run/value-class-extractor.scala index 3eaffa0c2397..5628fea47350 100644 --- a/tests/pending/run/value-class-extractor.scala +++ b/tests/run/value-class-extractor.scala @@ -6,12 +6,13 @@ object NonNullChar { @inline final val None = new NonNullChar(0.toChar) } -final class SomeProduct extends Product3[String, Int, List[String]] { +final class SomeProduct /*extends Product3[String, Int, List[String]]*/ { def canEqual(x: Any) = x.isInstanceOf[SomeProduct] def _1 = "abc" def _2 = 5 def _3 = List("bippy") def isEmpty = false + def isDefined = !isEmpty def get = this } object SomeProduct { diff --git a/tests/pending/run/valueclasses-constr.check b/tests/run/valueclasses-constr.check similarity index 100% rename from tests/pending/run/valueclasses-constr.check rename to tests/run/valueclasses-constr.check diff --git a/tests/pending/run/valueclasses-constr.scala b/tests/run/valueclasses-constr.scala similarity index 100% rename from tests/pending/run/valueclasses-constr.scala rename to tests/run/valueclasses-constr.scala