Redo the bad constant removal I failed on last night.

jruby · Jun 10, 2010 · f5f9ce3 · f5f9ce3
1 parent 43b8784
commit f5f9ce3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/org/jruby/compiler/impl/BaseBodyCompiler.java b/src/org/jruby/compiler/impl/BaseBodyCompiler.java
@@ -202,14 +202,6 @@ protected int getClosureIndex() {
         return StandardASMCompiler.ARGS_INDEX + argParamCount + StandardASMCompiler.CLOSURE_OFFSET;
     }
 
-    protected int getRuntimeIndex() {
-        return StandardASMCompiler.ARGS_INDEX + argParamCount + StandardASMCompiler.RUNTIME_OFFSET;
-    }
-
-    protected int getNilIndex() {
-        return StandardASMCompiler.ARGS_INDEX + argParamCount + StandardASMCompiler.NIL_OFFSET;
-    }
-
     protected int getPreviousExceptionIndex() {
         return StandardASMCompiler.ARGS_INDEX + argParamCount + StandardASMCompiler.PREVIOUS_EXCEPTION_OFFSET;
     }

diff --git a/src/org/jruby/compiler/impl/StandardASMCompiler.java b/src/org/jruby/compiler/impl/StandardASMCompiler.java
@@ -136,12 +136,10 @@ public static String getClosure19Signature() {
 
     public static final int CLOSURE_OFFSET = 0;
     public static final int DYNAMIC_SCOPE_OFFSET = 1;
-    public static final int RUNTIME_OFFSET = 2;
+    public static final int VARS_ARRAY_OFFSET = 2;
-    public static final int VARS_ARRAY_OFFSET = 3;
+    public static final int EXCEPTION_OFFSET = 3;
-    public static final int NIL_OFFSET = 4;
+    public static final int PREVIOUS_EXCEPTION_OFFSET = 4;
-    public static final int EXCEPTION_OFFSET = 5;
+    public static final int FIRST_TEMP_OFFSET = 5;
-    public static final int PREVIOUS_EXCEPTION_OFFSET = 6;
-    public static final int FIRST_TEMP_OFFSET = 7;
 
     public static final int STARTING_DSTR_SIZE = 20;