1 files changed, 7 insertions, 5 deletions

diff --git a/iseq.h b/iseq.h
index de8beff1ad..aad9bdd402 100644
--- a/iseq.h
+++ b/iseq.h
@@ -46,23 +46,25 @@ ISEQ_FLIP_CNT_INCREMENT(const rb_iseq_t *iseq)
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ(const rb_iseq_t *iseq)
 {
-    VALUE str = iseq->body->variable.original_iseq;
-    if (RTEST(str)) return (VALUE *)RSTRING_PTR(str);
+    rb_imemo_alloc_t *str = (void *)iseq->body->variable.original_iseq;
+    if (RTEST(str)) return str->ptr;
     return NULL;
 }
 
 static inline void
 ISEQ_ORIGINAL_ISEQ_CLEAR(const rb_iseq_t *iseq)
 {
-    RB_OBJ_WRITE(iseq, &iseq->body->variable.original_iseq, Qnil);
+    rb_free_tmp_buffer(&iseq->body->variable.original_iseq);
+    RB_OBJ_WRITE(iseq, &iseq->body->variable.original_iseq, Qfalse);
 }
 
 static inline VALUE *
 ISEQ_ORIGINAL_ISEQ_ALLOC(const rb_iseq_t *iseq, long size)
 {
-    VALUE str = rb_str_tmp_new(size * sizeof(VALUE));
+    VALUE str;
+    VALUE *ptr = rb_alloc_tmp_buffer_with_count(&str, sizeof(VALUE), size);
     RB_OBJ_WRITE(iseq, &iseq->body->variable.original_iseq, str);
-    return (VALUE *)RSTRING_PTR(str);
+    return ptr;
 }
 
 #define ISEQ_TRACE_EVENTS (RUBY_EVENT_LINE  | \