Get boolean unboxing working a bit better. Simple loops compile.

jruby · Jan 25, 2016 · 41e1f5f · 41e1f5f
1 parent 08ade3e
commit 41e1f5f
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -870,7 +870,7 @@ public TemporaryLocalVariable getNewUnboxedVariable(Class type) {
             varType = TemporaryVariableType.FLOAT;
         } else if (type == Fixnum.class) {
             varType = TemporaryVariableType.FIXNUM;
-        } else if (type == Boolean.class) {
+        } else if (type == java.lang.Boolean.class) {
             varType = TemporaryVariableType.BOOLEAN;
         } else {
             varType = TemporaryVariableType.LOCAL;

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/UnboxableOpsAnalysisNode.java
@@ -349,8 +349,8 @@ private boolean matchingTypes(Class c, TemporaryVariableType t) {
         switch (t) {
         case FLOAT: return c == Float.class;
         case FIXNUM: return c == Fixnum.class;
-        case BOOLEAN: return c == Boolean.class;
-        default: return c != Float.class && c != Boolean.class && c != Fixnum.class;
+        case BOOLEAN: return c == java.lang.Boolean.class;
+        default: return c != Float.class && c != java.lang.Boolean.class && c != Fixnum.class;
         }
     }
 
@@ -387,7 +387,7 @@ public void boxVar(UnboxState state, Class reqdType, Map<Variable, TemporaryLoca
 
     public void unboxVar(UnboxState state, Class reqdType, Map<Variable, TemporaryLocalVariable> unboxMap, Variable v, List<Instr> newInstrs) {
         Variable unboxedV = getUnboxedVar(reqdType, unboxMap, v);
-        if (reqdType == Boolean.class) {
+        if (reqdType == java.lang.Boolean.class) {
             newInstrs.add(new UnboxBooleanInstr(unboxedV, v));
         } else if (reqdType == Float.class) { // SSS FIXME: This is broken
             newInstrs.add(new UnboxFloatInstr(unboxedV, v));