diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-07 13:59:05 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-07 13:59:05 -0700 |
| commit | 9a2f6c75cce22565b994c0b8bd2af8acc6e6f178 (patch) | |
| tree | acef270db60b2fe2c8538bfcdbbcc8379b89eb30 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
| parent | 65a068f42d6b097db5093e0441ab6fec4e8e331c (diff) | |
| parent | a86c7a15d1a58e828b61fc12a8b3d0ef0b2f8061 (diff) | |
| download | scala-9a2f6c75cce22565b994c0b8bd2af8acc6e6f178.tar.gz scala-9a2f6c75cce22565b994c0b8bd2af8acc6e6f178.tar.bz2 scala-9a2f6c75cce22565b994c0b8bd2af8acc6e6f178.zip | |
Merge pull request #2493 from paulp/pr/null-hardening
Hardening against nulls for deserialization.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 2ad4ec43f7..f27c15180e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -218,7 +218,10 @@ trait Implicits { case _ => false } override def hashCode = name.## + pre.## + sym.## - override def toString = name + ": " + tpe + override def toString = ( + if (tpeCache eq null) name + ": ?" + else name + ": " + tpe + ) } /** A sentinel indicating no implicit was found */ |