diff options
| author | Paul Phillips <paulp@improving.org> | 2013-06-23 14:50:44 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-06-23 14:50:44 -0700 |
| commit | 693a36d7692628c5765276a2d7390aae75eed5e5 (patch) | |
| tree | fe2b8ca64905a633a533a370d5ae130e72fdbae9 /src/reflect | |
| parent | b6bc53479984f9fc0528a8ce3f6f0b582cb4147f (diff) | |
| parent | a95432168204964e4f6c4571e781559c1640f2d8 (diff) | |
| download | scala-693a36d7692628c5765276a2d7390aae75eed5e5.tar.gz scala-693a36d7692628c5765276a2d7390aae75eed5e5.tar.bz2 scala-693a36d7692628c5765276a2d7390aae75eed5e5.zip | |
Merge pull request #2637 from retronym/ticket/7439
SI-7439 Avoid NPE in `isMonomorphicType` with stub symbols. …
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 2da9fa1cca..c3596fe62e 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -752,7 +752,9 @@ trait Symbols extends api.Symbols { self: SymbolTable => final def isMonomorphicType = isType && { val info = originalInfo - info.isComplete && !info.isHigherKinded + ( (info eq null) + || (info.isComplete && !info.isHigherKinded) + ) } def isStrictFP = hasAnnotation(ScalaStrictFPAttr) || (enclClass hasAnnotation ScalaStrictFPAttr) |