fix call java.lang.Object methods for primitive

Author: uujava

src/org/mirah/jvm/compiler/call_compiler.mirah

@@ -30,6 +30,7 @@ import mirah.objectweb.asm.Opcodes
 import mirah.objectweb.asm.Type
 import mirah.objectweb.asm.commons.GeneratorAdapter
 import mirah.objectweb.asm.commons.Method
+import static org.mirah.jvm.types.JVMTypeUtils.*
 
 class CallCompiler < BaseCompiler implements MemberVisitor
   def self.initialize:void
@@ -274,10 +275,15 @@ class CallCompiler < BaseCompiler implements MemberVisitor
   def visitMethodCall(method:JVMMethod, expression:boolean)
     isVoid = method.returnType.getAsmType.getDescriptor.equals('V')
     compile(@target)
+    targetType = getInferredType(@target)
+    if isPrimitive(targetType)
+      # java.lang.Object method called on primitive - call on boxed instance
+      @method.box(targetType.getAsmType)
+    end
     returnType = method.returnType
     if expression && isVoid
       @method.dup
-      returnType = getInferredType(@target)
+      returnType = targetType
     end
     convertArgs(method.argumentTypes)
     recordPosition
@@ -384,6 +390,10 @@ class CallCompiler < BaseCompiler implements MemberVisitor
 
   def visitInstanceof(method, expression)
     compile(@target)
+    type = getInferredType(@target)
+    if isPrimitive(type)
+      raise VerifyError, "kind_of? operation not defined for #{@target} with type #{getInferredType(@target)} #{getInferredType(@target).getClass}"
+    end
     if expression
       @method.instanceOf(getInferredType(@args[0]).getAsmType)
     else
@@ -395,14 +405,21 @@ class CallCompiler < BaseCompiler implements MemberVisitor
     compile(@target)
     if expression
       recordPosition
-      nonNull = @method.newLabel
-      done = @method.newLabel
-      @method.ifNonNull(nonNull)
-      @method.push(1)
-      @method.goTo(done)
-      @method.mark(nonNull)
-      @method.push(0)
-      @method.mark(done)
+      type = getInferredType(@target)
+      if isPrimitive(type)
+        # always not null
+        @method.pop(type)
+        @method.push(0)
+      else
+        nonNull = @method.newLabel
+        done = @method.newLabel
+        @method.ifNonNull(nonNull)
+        @method.push(1)
+        @method.goTo(done)
+        @method.mark(nonNull)
+        @method.push(0)
+        @method.mark(done)
+      end
     else
       @method.pop
     end

test/jvm/extensions/numeric_operators_test.rb

@@ -113,4 +113,23 @@ def test_unary_minus
       assert_run_output("-1.0\njava.lang.#{type}\n", cls)
     end
   end
+
+  def test_numeric_object_methods
+    cls, = compile("puts 1.hashCode === Integer.new(1).hashCode
+               puts 1.equals(Integer.new(1))
+               puts 1.equals(nil)
+               puts 1.equals('1')
+               puts false.equals(false)
+               puts 1.nil?
+
+    ")
+    assert_run_output("true\ntrue\nfalse\nfalse\ntrue\nfalse\n", cls)
+
+    begin
+      compile("1.kind_of? Integer")
+      fail "kind_of? for primitve not supported"
+    rescue
+      # ok
+    end
+  end
 end