From 747e22322330a762dd54037ccc1cb3608c6691bd Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 11 Apr 2017 16:57:16 -0700 Subject: Actually retract clashing synthetic apply/unapply The completer set the IS_ERROR flag and I assumed the typer dropped a synthetic tree with a symbol with that flag, because the tree was not shown in -Xprint output. It turns out, as explained by lrytz, that the mechanism was fragile because it relied on the order in which completers are run. We now cover both the case that: - the completer was run (and the `IS_ERROR` flag was set) before `addSynthetics` in `typedStat` iterates over the scope (since the symbol is already unlinked, the tree is not added, irrespective of its flags). For this case, we also remove the symbol from the synthetics in its unit. - the completer is triggered during the iteration in `addSynthetics`, which needs the check for the `IS_ERROR` flag during the iteration. Thankfully, the community build caught my mistake, and lrytz provided a good analysis and review. Fix scala/bug#10261 --- test/files/run/t10261/Test_2.scala | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 test/files/run/t10261/Test_2.scala (limited to 'test/files/run/t10261/Test_2.scala') diff --git a/test/files/run/t10261/Test_2.scala b/test/files/run/t10261/Test_2.scala new file mode 100644 index 0000000000..d7d9fe9a0e --- /dev/null +++ b/test/files/run/t10261/Test_2.scala @@ -0,0 +1,14 @@ +import scala.util.Try + +object C extends Companion[C] { + def parse(v: String) = if (v.nonEmpty) Some(new C(v)) else None +} + +case class C(value: String) + +object Test { + def main(args: Array[String]): Unit = { + assert(Try{C("")}.isFailure, "Empty value should fail to parse") // check that parse is used to validate input + assert(C("a").value == "a", "Unexpected value") + } +} -- cgit v1.2.3