Fixed #3529: Stored value type does not match pointer operand type

crystal-lang · Nov 12, 2016 · 59b600b · 59b600b
1 parent 2ce8c24
commit 59b600b
Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/spec/compiler/codegen/def_spec.cr b/spec/compiler/codegen/def_spec.cr
@@ -530,4 +530,22 @@ describe "Code gen: def" do
       fn(n)
       )).to_i.should eq(10)
   end
+
+  it "uses dispatch call type for phi (#3529)" do
+    codegen(%(
+      def foo(x : Int32)
+        yield
+        1.0
+      end
+
+      def foo(x : Int64)
+        yield
+        1.0
+      end
+
+      foo(1 || 1_i64) do
+        break
+      end
+      ), inject_primitives: false)
+  end
 end
diff --git a/src/compiler/crystal/codegen/call.cr b/src/compiler/crystal/codegen/call.cr
@@ -367,7 +367,7 @@ class Crystal::CodeGenVisitor
           end
           accept call
 
-          phi.add @last, a_def.type
+          phi.add @last, call.type
           position_at_end next_def_label
         end
         unreachable