Fixed #230: must include original def owner in mangled name for corre…

…ct results

spec/compiler/codegen/def_spec.cr

@@ -494,4 +494,31 @@ describe "Code gen: def" do
       method(foo)
       ").to_i.should eq(1)
   end
+
+  it "fixes #230: include original owner in mangled def" do
+    run(%(
+      class Base
+        def some(other : self)
+          false
+        end
+
+        def some(other)
+          false
+        end
+      end
+
+      class Foo(T) < Base
+        def some(other : Foo)
+          true
+        end
+      end
+
+      a = Foo(Int32).new
+      b = Foo(Int32).new || Foo(Int32 | Nil).new || true
+      a.some(b)
+
+      c = Foo(Int32).new
+      c.some(c)
+      )).to_b.should be_true
+  end
 end

src/compiler/crystal/codegen/ast.cr

@@ -170,6 +170,10 @@ module Crystal
             str << "::"
           elsif !owner.is_a?(Crystal::Program)
             owner.llvm_name(str)
+            if original_owner != self_type
+              str << "@"
+              original_owner.llvm_name(str)
+            end
             str << "#"
           end
         end

src/compiler/crystal/semantic/call.cr

@@ -1158,6 +1158,7 @@ module Crystal
 
       typed_def = untyped_def.clone
       typed_def.owner = owner
+      typed_def.original_owner = untyped_def.owner
 
       if body = typed_def.body
         typed_def.bind_to body

src/compiler/crystal/semantic/def.cr

@@ -3,6 +3,7 @@ require "../syntax/ast"
 module Crystal
   class Def
     property! :owner
+    property! :original_owner
     property :vars
     property :raises
 
@@ -98,6 +99,7 @@ module Crystal
       expansion.uses_block_arg = uses_block_arg
       expansion.yields = yields
       expansion.location = location
+      expansion.owner = owner?
 
       if retain_body
         new_body = [] of ASTNode

src/compiler/crystal/types.cr

@@ -1891,7 +1891,11 @@ module Crystal
     end
 
     def tuple_indexer(index)
-      @tuple_indexers[index] ||= Def.new("[]", [Arg.new("index")], TupleIndexer.new(index))
+      @tuple_indexers[index] ||= begin
+        indexer = Def.new("[]", [Arg.new("index")], TupleIndexer.new(index))
+        indexer.owner = self
+        indexer
+      end
     end
 
     def var