Skip to content

Fix #1908: give synthetic default params correct flags #1910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion compiler/src/dotty/tools/dotc/ast/Desugar.scala
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ object desugar {
vparamss = takeUpTo(normalizedVparamss.nestedMap(toDefParam), n),
tpt = TypeTree(),
rhs = vparam.rhs
).withMods(Modifiers(mods.flags & AccessFlags, mods.privateWithin))
)
.withMods(Modifiers(mods.flags & AccessFlags, mods.privateWithin))
.withFlags(Synthetic)
val rest = defaultGetters(vparams :: vparamss1, n + 1)
if (vparam.rhs.isEmpty) rest else defaultGetter :: rest
case Nil :: vparamss1 =>
Expand Down
49 changes: 49 additions & 0 deletions compiler/test/dotty/tools/dotc/ast/DesugarTests.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package dotty.tools
package dotc
package ast

import core._
import Names._, Types._ , Symbols._, StdNames._, Flags._, Contexts._

import org.junit.Test
import org.junit.Assert._

class DesugarTests extends DottyTest {
import tpd._

private def validSym(sym: Symbol)(implicit ctx: Context): Unit = {
assert(
// remaining symbols must be either synthetic:
sym.is(Synthetic) ||
// or be a type argument from product:
(sym.isType && sym.is(BaseTypeArg)) ||
// or be a constructor:
sym.name == nme.CONSTRUCTOR,
s"found: $sym (${sym.flags})"
)
}

@Test def caseClassHasCorrectMembers =
checkCompile("frontend", "case class Foo(x: Int, y: String)") { (tree, context) =>
implicit val ctx = context
val ccTree = tree.find(tree => tree.symbol.name == typeName("Foo")).get
val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)

val x :: y :: rest = foo.decls.toList

// Make sure we extracted the correct values from foo:
assert(x.name == termName("x"))
assert(y.name == termName("y"))

rest.foreach(validSym)
}

@Test def caseClassCompanionHasCorrectMembers =
checkCompile("frontend", "case class Foo(x: Int, y: String)") { (tree, context) =>
implicit val ctx = context
val ccTree = tree.find(tree => tree.symbol.name == termName("Foo")).get
val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)

foo.decls.foreach(validSym)
}
}