Fixed #3016: self not correctly set in instance variable initializer

crystal-lang · Jul 20, 2016 · 514778f · 514778f
1 parent d777ce2
commit 514778f
Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/spec/compiler/codegen/proc_spec.cr b/spec/compiler/codegen/proc_spec.cr
@@ -699,4 +699,18 @@ describe "Code gen: proc" do
       ->(x : Int32) { 'a' }.t
       )).to_string.should eq("TupleLiteral")
   end
+
+  it "codegens proc in instance var initialize (#3016)" do
+    run(%(
+      class Foo
+        @f : -> Int32 = ->foo
+
+        def foo
+          42
+        end
+      end
+
+      Foo.new.@f.call
+      )).to_i.should eq(42)
+  end
 end
diff --git a/src/compiler/crystal/codegen/codegen.cr b/src/compiler/crystal/codegen/codegen.cr
@@ -1882,7 +1882,11 @@ module Crystal
         end
 
         with_cloned_context do
+          # Instance var initializers must run with "self"
+          # properly set up to the type being allocated
+          context.type = real_type
           context.vars = LLVMVars.new
+          context.vars["self"] = LLVMVar.new(type_ptr, real_type)
           alloca_vars init.meta_vars
 
           value.accept self