diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-03-16 22:49:58 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-03-16 22:49:58 -0700 |
| commit | 9fd93232ceb815656f2b61c2eddf56617a9dc513 (patch) | |
| tree | ec13b8f0167e2f3cec0fa31f43496b951172d3ff | |
| parent | fa33395a25c87115c910e8d4a4124aee6134062b (diff) | |
| parent | edf954ff10b0f1fb7668018d43680646f8503b27 (diff) | |
| download | scala-9fd93232ceb815656f2b61c2eddf56617a9dc513.tar.gz scala-9fd93232ceb815656f2b61c2eddf56617a9dc513.tar.bz2 scala-9fd93232ceb815656f2b61c2eddf56617a9dc513.zip | |
Merge pull request #4384 from sschaef/issue9226-npe-in-gen-asm
SI-9226 Fix NPE in GenASM.writeIfNotTooBig
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala index 62268e1907..86a69b92ea 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala @@ -533,7 +533,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { self => } bytecodeWriter.writeClass(label, jclassName, arr, outF) } catch { - case e: java.lang.RuntimeException if e != null && (e.getMessage contains "too large!") => + case e: java.lang.RuntimeException if e.getMessage != null && (e.getMessage contains "too large!") => reporter.error(sym.pos, s"Could not write class $jclassName because it exceeds JVM code size limits. ${e.getMessage}") } |