2 files changed, 22 insertions, 0 deletions
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb
index a164b7a413..8b2d5b044e 100644
--- a/bootstraptest/test_yjit.rb
+++ b/bootstraptest/test_yjit.rb
@@ -1599,3 +1599,16 @@ assert_equal '10', %q{
 
   val
 }
+
+# regression test of local type change
+assert_equal '1.1', %q{
+def bar(baz, quux)
+  if baz.integer?
+    baz, quux = quux, nil
+  end
+  baz.to_s
+end
+
+bar(123, 1.1)
+bar(123, 1.1)
+}
diff --git a/yjit_core.c b/yjit_core.c
index 3f866b0a2b..5389f3af5f 100644
--- a/yjit_core.c
+++ b/yjit_core.c
@@ -266,6 +266,15 @@ void ctx_set_local_type(ctx_t* ctx, size_t idx, val_type_t type)
     if (idx >= MAX_LOCAL_TYPES)
         return;
 
+    // If any values on the stack map to this local we must detach them
+    for (int i = 0; i < MAX_TEMP_TYPES; i++) {
+        temp_mapping_t *mapping = &ctx->temp_mapping[i];
+        if (mapping->kind == TEMP_LOCAL && mapping->idx == idx) {
+            ctx->temp_types[i] = ctx->local_types[mapping->idx];
+            *mapping = MAP_STACK;
+        }
+    }
+
     ctx->local_types[idx] = type;
 }