crystal-lang · Feb 8, 2017 · Feb 8, 2017
Showing with 24 additions and 5 deletions.

+12 −0 spec/compiler/semantic/exception_spec.cr

+3 −3 src/compiler/crystal/codegen/call.cr

+2 −2 src/compiler/crystal/semantic/call.cr

+7 −0 src/compiler/crystal/semantic/main_visitor.cr
diff --git a/spec/compiler/semantic/exception_spec.cr b/spec/compiler/semantic/exception_spec.cr
@@ -442,4 +442,16 @@ describe "Semantic: exception" do
       a
       )) { int32 }
   end
+
+  it "doesn't infect type to variable before handler (#4002)" do
+    assert_type(%(
+      a = 1
+      b = a
+      begin
+        a = 'a'
+      rescue
+      end
+      b
+      )) { int32 }
+  end
 end
diff --git a/src/compiler/crystal/codegen/call.cr b/src/compiler/crystal/codegen/call.cr
@@ -290,12 +290,12 @@ class Crystal::CodeGenVisitor
   end
 
   def codegen_call_with_block_as_fun_literal(node, fun_literal, self_type, call_args)
-    target_def = node.target_def
-    func = target_def_fun(target_def, self_type)
-
     fun_literal.accept self
     call_args.push @last
 
+    target_def = node.target_def
+    func = target_def_fun(target_def, self_type)
+
     codegen_call_or_invoke(node, target_def, self_type, func, call_args, target_def.raises?, target_def.type)
   end
 

diff --git a/src/compiler/crystal/semantic/call.cr b/src/compiler/crystal/semantic/call.cr
@@ -534,11 +534,11 @@ class Crystal::Call
       vars = [] of Var
       args = [] of ASTNode
       block_arg_type.arg_types.map_with_index do |type, i|
-        arg = Var.new("__arg#{i}")
+        arg = Var.new("__arg#{i}").at(block_arg)
         vars << arg
         args << arg
       end
-      block = Block.new(vars, Call.new(block_arg.clone, "call", args).at(block_arg))
+      block = Block.new(vars, Call.new(block_arg.clone, "call", args).at(block_arg)).at(block_arg)
       block.vars = self.before_vars
       self.block = block
     else

diff --git a/src/compiler/crystal/semantic/main_visitor.cr b/src/compiler/crystal/semantic/main_visitor.cr
@@ -2485,7 +2485,14 @@ module Crystal
       # Any variable assigned in the body (begin) will have, inside rescue
       # blocks, all types that were assigned to them, because we can't know at which
       # point an exception is raised.
+      # We create different vars, though, to avoid changing the type of vars
+      # before the handler.
       exception_handler_vars = @exception_handler_vars = @vars.dup
+      exception_handler_vars.each do |name, var|
+        new_var = new_meta_var(name)
+        new_var.bind_to(var)
+        exception_handler_vars[name] = new_var
+      end
 
       node.body.accept self