diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 0dc32dabaa..6f54e2d6df 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -1301,6 +1301,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with /** local variables whose scope appears in this block. */ val varsInBlock: mutable.Set[Local] = new mutable.HashSet + val lastInstr = b.lastInstruction for (instr <- b) { @@ -1579,8 +1580,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with lastLineNr } - if (b.lastInstruction == instr) - endPC(b) = jcode.getPC() + if (instr eq lastInstr) { endPC(b) = jcode.getPC() } //System.err.println("CRTLINE: " + instr.pos + " " + // /* (if (instr.pos < clasz.cunit.source.content.length) clasz.cunit.source.content(instr.pos) else '*') + */ " " + crtLine); |