Skip to content

Fix #9295: Avoid recursive Dynamics conversion #9300

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 1 commit into from
Jul 10, 2020
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
12 changes: 11 additions & 1 deletion compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,19 @@ trait TypeAssigner {
val name = tree.name
val pre = maybeSkolemizePrefix(qualType, name)
val mbr = qualType.findMember(name, pre)
def isDynamicExpansion(tree: untpd.RefTree): Boolean = {
Dynamic.isDynamicMethod(name) || (
tree match
case Select(Apply(fun: untpd.RefTree, _), nme.apply) if defn.isContextFunctionClass(fun.symbol.owner) =>
isDynamicExpansion(fun)
case Select(qual, nme.apply) =>
Dynamic.isDynamicMethod(qual.symbol.name) && tree.span.isSynthetic
case _ => false
)
}
if (reallyExists(mbr))
qualType.select(name, mbr)
else if (qualType.derivesFrom(defn.DynamicClass) && name.isTermName && !Dynamic.isDynamicMethod(name))
else if (qualType.derivesFrom(defn.DynamicClass) && name.isTermName && !isDynamicExpansion(tree))
TryDynamicCallType
else if (qualType.isErroneous || name.toTermName == nme.ERROR)
UnspecifiedErrorType
Expand Down
9 changes: 9 additions & 0 deletions tests/neg/i9295a.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(arg: Any): Foo = ???
}
object F {
val foo = new Foo
def baz = foo.blah(43) // error: method applyDynamic in class Foo does not take more parameters
}
14 changes: 14 additions & 0 deletions tests/neg/i9295b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(arg: Any): Bar = ???
}
class Bar extends Dynamic {
def applyDynamic(arg: Any)(x: Int): Int = ???
}
object F {
val foo = new Foo
def baz = foo.blah(43) // error: method applyDynamic in class Foo does not take more parameters
def qux = foo.blah.blah(43) // error: value selectDynamic is not a member of Foo
def quxx = foo.blah().blah(43) // error: method applyDynamic in class Foo does not take more parameters
}
12 changes: 12 additions & 0 deletions tests/neg/i9295c.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def selectDynamic(name: String)(using DummyImplicit): Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah(42) // error
12 changes: 12 additions & 0 deletions tests/neg/i9295d.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(name: String)(): DummyImplicit ?=> Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah()(42) // error
12 changes: 12 additions & 0 deletions tests/pos/i9295.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(name: String)(): Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah().apply(42)
12 changes: 12 additions & 0 deletions tests/pos/i9295b.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(name: String)()(using DummyImplicit): Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah().apply(42)
12 changes: 12 additions & 0 deletions tests/pos/i9295c.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def selectDynamic(name: String)(using DummyImplicit): Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah.apply(42)
12 changes: 12 additions & 0 deletions tests/pos/i9295d.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.language.dynamics

class Foo extends Dynamic {
def applyDynamic(name: String)(): DummyImplicit ?=> DummyImplicit ?=> Bar = ???
}

class Bar extends Dynamic {
def applyDynamic(name: String)(x: Int) = ???
}

val foo = new Foo
def baz = foo.blah().apply(42)