Fixed #2597: Compiler Error on assigning a class or some subclass to …

…a field, regression from <0.16
crystal-lang · May 16, 2016 · 380d4ea · 380d4ea
1 parent 8d90285
commit 380d4ea
Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/spec/compiler/codegen/class_spec.cr b/spec/compiler/codegen/class_spec.cr
@@ -745,4 +745,47 @@ describe "Code gen: class" do
       foo.x
       )).to_i.should eq(42)
   end
+
+  it "codegens virtual metaclass union bug (#2597)" do
+    run(%(
+
+      class Foo
+        def self.foo
+          1
+        end
+      end
+
+      class Foo1 < Foo
+        def self.foo
+          2
+        end
+      end
+
+      class Foo2 < Foo
+        def self.foo
+          3
+        end
+      end
+
+      class Bar
+        @foo : Foo.class
+
+        def initialize
+          @foo = if 1 == 1
+                   Foo1
+                 elsif 1 == 2
+                   Foo2
+                 else
+                   Foo
+                 end
+        end
+
+        def foo
+          @foo
+        end
+      end
+
+      Bar.new.foo.foo
+      )).to_i.should eq(2)
+  end
 end
diff --git a/src/compiler/crystal/semantic/type_merge.cr b/src/compiler/crystal/semantic/type_merge.cr
@@ -222,7 +222,7 @@ module Crystal
   end
 
   class MetaclassType
-    def common_ancestor(other : MetaclassType)
+    def common_ancestor(other : MetaclassType | VirtualMetaclassType)
       if instance_type.module? || other.instance_type.module?
         nil
       else
@@ -245,7 +245,7 @@ module Crystal
   end
 
   class VirtualMetaclassType
-    def common_ancestor(other)
+    def common_ancestor(other : MetaclassType | VirtualMetaclassType)
       common = instance_type.base_type.metaclass.common_ancestor(other)
       common.try &.virtual_type!
     end