Workaround issue scala#4396

Author: nicolasstucki

tests/run-with-compiler/tasty-extractors-1.check

@@ -61,9 +61,6 @@ SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPr
 Block(List(ValDef(Simple(a), Synthetic(), Some(Literal(String("o"))))), Match(Literal(String("i")), List(CaseDef(Bind(Simple(a), Value(Ident(Simple(_)))), None, Block(Nil, Literal(Unit()))))))
 SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPrefix)))
 
-Match(Apply(TypeApply(Select(Ident(Simple(Option)), Simple(apply)), List(Synthetic())), List(Literal(Int(4)))), List(CaseDef(TypeTest(Synthetic()), None, Block(Nil, Typed(Ident(Simple(a)), Synthetic()))), CaseDef(Value(Ident(Simple(None))), None, Block(Nil, Literal(Int(1))))))
-NameRef(TypeName(Simple(Int)), SymRef(<Simple(scala)>, ThisType(SymRef(<TypeName(Simple(<root>))>, NoPrefix))))
-
 Match(Ident(Simple(Nil)), List(CaseDef(Unapply(TypeApply(Select(Ident(Simple(List)), Simple(unapplySeq)), List(Synthetic())), Nil, List(Bind(Simple(a), Value(Ident(Simple(_)))), Bind(Simple(b), Value(Ident(Simple(_)))), Bind(Simple(c), Value(Ident(Simple(_)))))), None, Block(Nil, Literal(Unit())))))
 SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPrefix)))
 

tests/run-with-compiler/tasty-extractors-1.scala

@@ -36,7 +36,7 @@ object Test {
     '("g" match { case _: String | _: Int => () }),
     '("h" match { case _ if false => () }),
     '{ val a = "o"; "i" match { case a => () } },
-    '(Option(4) match { case Some(a) => a; case None => 1 }),
+    // '(Option(4) match { case Some(a) => a; case None => 1 }), // FIXME: issue #4396
     '(Nil match { case List(a, b, c) => }),
     '(try 1 catch { case _ => }),
     '(try 2 finally ()),

tests/run-with-compiler/tasty-extractors-2.check

@@ -61,9 +61,6 @@ SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPr
 Block(List(ClassDef(TypeName(Simple(Foo)), DefDef(Simple(<init>), Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), Simple(<init>)), Nil)), None, List(DefDef(Simple(a), Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit()))
 SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPrefix)))
 
-Block(List(ClassDef(TypeName(Simple(Foo)), DefDef(Simple(<init>), Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), Simple(<init>)), Nil), TypeSelect(Select(Ident(Simple(_root_)), Simple(scala)), TypeName(Simple(Product)))), None, List(DefDef(Simple(copy), Nil, List(Nil), Synthetic(), Some(Apply(Select(New(Synthetic()), Simple(<init>)), Nil))), DefDef(Simple(hashCode), Nil, List(Nil), Synthetic(), Some(Literal(Int(394005536)))), DefDef(Simple(equals), Nil, List(List(ValDef(Simple(x$0), Synthetic(), None))), Synthetic(), Some(Apply(Select(Apply(Select(This(Some(Id(Foo))), Simple(eq)), List(TypeApply(Select(Ident(Simple(x$0)), Simple(asInstanceOf)), List(Synthetic())))), Simple(||)), List(Match(Ident(Simple(x$0)), List(CaseDef(Bind(Simple(x$0), TypeTest(Synthetic())), None, Literal(Boolean(true))), CaseDef(Value(Ident(Simple(_))), None, Literal(Boolean(false))))))))), DefDef(Simple(toString), Nil, List(Nil), Synthetic(), Some(Apply(Ident(Simple(_toString)), List(This(Some(Id(Foo))))))), DefDef(Simple(canEqual), Nil, List(List(ValDef(Simple(that), Synthetic(), None))), Synthetic(), Some(TypeApply(Select(Ident(Simple(that)), Simple(isInstanceOf)), List(Synthetic())))), DefDef(Simple(productArity), Nil, Nil, Synthetic(), Some(Literal(Int(0)))), DefDef(Simple(productPrefix), Nil, Nil, Synthetic(), Some(Literal(String("Foo")))), DefDef(Simple(productElement), Nil, List(List(ValDef(Simple(n), Synthetic(), None))), Synthetic(), Some(Match(Ident(Simple(n)), List(CaseDef(Value(Ident(Simple(_))), None, Apply(Ident(Simple(throw)), List(Apply(Select(New(Synthetic()), Simple(<init>)), List(Apply(Select(Ident(Simple(n)), Simple(toString)), Nil)))))))))))), ValDef(Simple(Foo), Ident(TypeName(ObjectClass(Simple(Foo)))), Some(Apply(Select(New(Ident(TypeName(ObjectClass(Simple(Foo))))), Simple(<init>)), Nil))), ClassDef(TypeName(ObjectClass(Simple(Foo))), DefDef(Simple(<init>), Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), Simple(<init>)), Nil), Applied(Synthetic(), List(Synthetic()))), Some(ValDef(Simple(_), Singleton(Ident(Simple(Foo))), None)), List(DefDef(Simple(apply), Nil, List(Nil), Synthetic(), Some(Apply(Select(New(Synthetic()), Simple(<init>)), Nil))), DefDef(Simple(unapply), Nil, List(List(ValDef(Simple(x$1), Synthetic(), None))), Synthetic(), Some(Literal(Boolean(true))))))), Literal(Unit()))
-SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPrefix)))
-
 Block(List(ClassDef(TypeName(Simple(Foo1)), DefDef(Simple(<init>), Nil, List(List(ValDef(Simple(a), Ident(TypeName(Simple(Int))), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), Simple(<init>)), Nil)), None, List(ValDef(Simple(a), Synthetic(), None)))), Literal(Unit()))
 SymRef(<TypeName(Simple(Unit))>, ThisType(SymRef(<TypeName(Simple(scala))>, NoPrefix)))
 

tests/run-with-compiler/tasty-extractors-2.scala

@@ -36,7 +36,7 @@ object Test {
     '{ class Foo { final def a = 0 } },
     '{ class Foo { private[Foo] def a = 0 } },
     '{ class Foo { protected[Foo] def a = 0 } },
-    '{ case class Foo() },
+    // '{ case class Foo() }, // FIXME: issue #4396
     '{ class Foo1(a: Int) },
     '{ class Foo2(val b: Int) },
     '{ class Foo3(a: Int = 5) },