Merge branch 'release/0.18'

crystal-lang · Jun 20, 2016 · be4143f · be4143f
2 parents d4550f6 + 95faf73
commit be4143f
Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/spec/compiler/codegen/pointer_spec.cr b/spec/compiler/codegen/pointer_spec.cr
@@ -406,4 +406,36 @@ describe "Code gen: pointer" do
       LibFoo.foo(Foo.new)
       ))
   end
+
+  it "uses correct llvm module for typedef metaclass (#2877)" do
+    run(%(
+      require "prelude"
+
+      lib LibFoo
+        type Foo = Void*
+        type Bar = Void*
+      end
+
+      class Class
+        def foo
+          foo(1)
+        end
+
+        def foo(x)
+        end
+      end
+
+      struct Pointer
+        def foo
+          T.foo
+        end
+      end
+
+      foo = uninitialized LibFoo::Foo*
+      bar = uninitialized LibFoo::Bar*
+      foo.foo
+      bar.foo
+      1
+      ))
+  end
 end
diff --git a/spec/compiler/codegen/super_spec.cr b/spec/compiler/codegen/super_spec.cr
@@ -398,7 +398,7 @@ describe "Codegen: super" do
   end
 
   it "calls super from virtual metaclass type (#2841)" do
-    codegen(%(
+    run(%(
       require "prelude"
 
       abstract class Foo

diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -2627,6 +2627,13 @@ module Crystal
       instance_type.virtual_type!.metaclass
     end
 
+    def remove_typedef
+      if instance_type.is_a?(TypeDefType)
+        return instance_type.remove_typedef.metaclass
+      end
+      self
+    end
+
     def to_s_with_options(io : IO, skip_union_parens : Bool = false, generic_args : Bool = true, codegen = false)
       io << @name
     end