Browse files

Redo the bad constant removal I failed on last night.

  • Loading branch information...
1 parent 43b8784 commit f5f9ce3d09885710129d9b99b707921ddabf69fb @headius headius committed Jun 10, 2010
View
8 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;
}
View
10 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 = 3;
- public static final int NIL_OFFSET = 4;
- public static final int EXCEPTION_OFFSET = 5;
- public static final int PREVIOUS_EXCEPTION_OFFSET = 6;
- public static final int FIRST_TEMP_OFFSET = 7;
+ public static final int VARS_ARRAY_OFFSET = 2;
+ public static final int EXCEPTION_OFFSET = 3;
+ public static final int PREVIOUS_EXCEPTION_OFFSET = 4;
+ public static final int FIRST_TEMP_OFFSET = 5;
public static final int STARTING_DSTR_SIZE = 20;

0 comments on commit f5f9ce3

Please sign in to comment.