transfer try/catch and line number info to the fragments

Author: sorear

src/vm/jvm/runtime/org/perl6/nqp/jast2bc/AutosplitMethodWriter.java

@@ -1249,8 +1249,8 @@ private void emitFragment(int fno, int begin, int end) {
         for (int i = 0; i < exitPts.length; i++)
             exitTrampolineLabels.put(exitPts[i], new Label());
 
-        Label[] insnLabels = new Label[end - begin];
-        for (int i = 0; i < end - begin; i++)
+        Label[] insnLabels = new Label[end - begin + 1];
+        for (int i = 0; i < end - begin + 1; i++)
             insnLabels[i] = new Label();
 
         // common entry code
@@ -1268,6 +1268,18 @@ private void emitFragment(int fno, int begin, int end) {
         int stash = nlocal;
         int scratch = nlocal+1;
 
+        // emit salient tryblocks
+        for (TryCatchBlockNode tcbn : (List<TryCatchBlockNode>) tryCatchBlocks) {
+            int nstart = Math.max(begin, insnMap.get(tcbn.start));
+            int nend   = Math.min(end, insnMap.get(tcbn.end));
+            int nhndlr = insnMap.get(tcbn.handler);
+            if (nstart >= nend) continue;
+
+            v.visitTryCatchBlock(insnLabels[nstart - begin], insnLabels[nend - begin],
+                    exitTrampolineLabels.containsKey(nhndlr) ? exitTrampolineLabels.get(nhndlr) : insnLabels[nhndlr - begin],
+                    tcbn.type);
+        }
+
         // uncommon entry code
         for (int ept : entryPts) {
             v.visitLabel(entryTrampolineLabels[jumpNoMap[ept]-firstj]);
@@ -1288,10 +1300,19 @@ private void emitFragment(int fno, int begin, int end) {
         for (int iix = begin; iix < end; iix++) {
             emitFragmentInsn(v, iix, begin, insnLabels, exitTrampolineLabels, spilledUTypes);
         }
+        v.visitLabel(insnLabels[end - begin]);
 
         if (exitTrampolineLabels.containsKey(end))
             v.visitJumpInsn(Opcodes.GOTO, exitTrampolineLabels.get(end));
 
+        int lineno = -1;
+        for (int i = begin; i < end; i++) {
+            if (lineNumbers[i] != lineno) {
+                lineno = lineNumbers[i];
+                v.visitLineNumber(lineno, insnLabels[i-begin]);
+            }
+        }
+
         Label commonExitLabel = new Label();
 
         // uncommon exit code