diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-12-15 11:08:57 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-12-16 13:15:04 +0100 |
| commit | 38ac631438adfb0dd06725cfe23cff3552943170 (patch) | |
| tree | 8203561c2b9c5f6b30ee5ce20bc2ab375ceb1f2f /src/dotty/tools/dotc/core/Definitions.scala | |
| parent | 11e7dd8b12c29bac37a1d1bb2e111206fc5f9f3e (diff) | |
| download | dotty-38ac631438adfb0dd06725cfe23cff3552943170.tar.gz dotty-38ac631438adfb0dd06725cfe23cff3552943170.tar.bz2 dotty-38ac631438adfb0dd06725cfe23cff3552943170.zip | |
Make String_valueOf_Object agnostic of whether it runs before or after erasure
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index 25575c492..a7c7ac3c6 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -273,7 +273,7 @@ class Definitions { lazy val String_+ = newMethod(StringClass, nme.raw.PLUS, methOfAny(StringType), Final) lazy val String_valueOf_Object = StringModule.info.member(nme.valueOf).suchThat(_.info.firstParamTypes match { - case List(pt) => pt isRef AnyClass + case List(pt) => (pt isRef AnyClass) || (pt isRef ObjectClass) case _ => false }).symbol |