Merge branch 'debug-vars'

Author: donaldh

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

@@ -144,9 +144,7 @@ private static boolean processMethod(BufferedReader in, ClassWriter c, String cl
         String curLine, methodName = null, returnType = null;
         String crName = null, crCuid = null, crOuter = null;
         boolean isStatic = false;
-        List<String> argNames = new ArrayList<String>();
         List<Type> argTypes = new ArrayList<Type>();
-        Map<String, Integer> argIndexes = new HashMap<String, Integer>();
         Map<String, VariableDef> localVariables = new HashMap<String, VariableDef>();
         Map<String, Label> labelMap = new HashMap<String, Label>();
         Stack<Label> tryStartStack = new Stack<Label>();
@@ -162,7 +160,6 @@ private static boolean processMethod(BufferedReader in, ClassWriter c, String cl
 
         MethodVisitor m = null;
         boolean contAfter = false;
-        
         boolean inMethodHeader = true;
         while ((curLine = in.readLine()) != null) {
             // See if we need to move to the next method.
@@ -185,21 +182,16 @@ else if (curLine.equals("++ static")) {
                     isStatic = true;
                     curArgIndex = 0; /* No invocant. */
                 }
-                else if (curLine.startsWith("++ arg ")) {
-                    String[] bits = curLine.split("\\s", 4);
-                    Type t = processType(bits[3]);
-                    argNames.add(bits[2]);
-                    argTypes.add(t);
-                    argIndexes.put(bits[2], curArgIndex);
-                    curArgIndex += (t == Type.LONG_TYPE || t == Type.DOUBLE_TYPE ? 2 : 1);
-                }
-                else if (curLine.startsWith("++ local ")) {
+                else if (curLine.startsWith("++ local ") || curLine.startsWith("++ arg")) {
                     String[] bits = curLine.split("\\s", 4);
                     if (localVariables.containsKey(bits[2]))
                         throw new Exception("Duplicate local name: " + bits[2]);
                     Type t = processType(bits[3]);
                     localVariables.put(bits[2], new VariableDef(curArgIndex, t.getDescriptor(), beginAll, endAll));
                     curArgIndex += (t == Type.LONG_TYPE || t == Type.DOUBLE_TYPE ? 2 : 1);
+                    if (curLine.startsWith("++ arg")) {
+                    	argTypes.add(t);
+                    }
                 }
                 else if (curLine.startsWith("++ crname "))
                     crName = curLine.substring("++ crname ".length());
@@ -275,7 +267,11 @@ else if (curLine.startsWith("++ handlers ")) {
                     av.visit("handlers", crHandlers);
                     av.visitEnd();
                  }
-                 
+
+                 if (!isStatic) {
+                	 localVariables.put("this", new VariableDef(0, "L"+className+";", beginAll, endAll));
+                 }                 
+
                  m.visitCode();
                  m.visitLabel(beginAll);
             }
@@ -359,7 +355,7 @@ else if (curLine.startsWith(".line ")) {
             }
 
             // Process line as an instruction.
-            emitInstruction(in, m, labelMap, argIndexes, localVariables, curLine);
+            emitInstruction(in, m, labelMap, localVariables, curLine);
         }
         if (inMethodHeader)
             throw new Exception("Unexpected end of file in method header");
@@ -370,12 +366,6 @@ else if (curLine.startsWith(".line ")) {
             VariableDef def = e.getValue();
             m.visitLocalVariable(e.getKey(), def.type, null, def.start, def.end, def.index);
         }
-        if (!isStatic)
-            m.visitLocalVariable("this", "L"+className+";", null, beginAll, endAll, 0);
-        for (int i = 0; i < argTypes.size(); i++) {
-            m.visitLocalVariable(argNames.get(i), argTypes.get(i).getDescriptor(), null,
-                    beginAll, endAll, argIndexes.get(argNames.get(i)));
-        }
 
         m.visitMaxs(0, 0);
         m.visitEnd();
@@ -406,7 +396,6 @@ private static String decodeString(String value) {
 
     private static void emitInstruction(BufferedReader in, MethodVisitor m,
             Map<String, Label> labelMap,
-            Map<String, Integer> argIndexes,
             Map<String, VariableDef> localVariables,
             String curLine) throws Exception {
         // Find instruction code and get rest of the string.
@@ -445,8 +434,6 @@ private static void emitInstruction(BufferedReader in, MethodVisitor m,
         case 0x19: // aload
             if (localVariables.containsKey(rest))
                 m.visitVarInsn(instruction, localVariables.get(rest).index);
-            else if (argIndexes.containsKey(rest))
-                m.visitVarInsn(instruction, argIndexes.get(rest));
             else
                 throw new Exception("Undeclared local variable: " + rest);
             break;
@@ -527,8 +514,6 @@ else if (argIndexes.containsKey(rest))
         case 0x3a: // astore
             if (localVariables.containsKey(rest))
                 m.visitVarInsn(instruction, localVariables.get(rest).index);
-            else if (argIndexes.containsKey(rest))
-                m.visitVarInsn(instruction, argIndexes.get(rest));
             else
                 throw new Exception("Undeclared local variable: " + rest);
             break;