diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-12-07 09:45:58 -0800 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-12-07 09:45:58 -0800 |
| commit | 4d439dd4b2bb9e2364fc494af9f3ae4686ff9f65 (patch) | |
| tree | 31aadf6c4564643bb514e609f6752130aab6e1b0 /src | |
| parent | a774157a4b666f29b7cd4bd958ea1ac150380959 (diff) | |
| parent | 8d74fa024262c1bd2dc7ed64788b95f888396c05 (diff) | |
| download | scala-4d439dd4b2bb9e2364fc494af9f3ae4686ff9f65.tar.gz scala-4d439dd4b2bb9e2364fc494af9f3ae4686ff9f65.tar.bz2 scala-4d439dd4b2bb9e2364fc494af9f3ae4686ff9f65.zip | |
Merge pull request #3230 from retronym/backport/7439
[backport] SI-7439 Avoid NPE in `isMonomorphicType` with stub symbols.
Diffstat (limited to 'src')
| -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 45c16b7302..b22c706bf4 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -709,7 +709,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) |