diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 08:20:35 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-02 08:20:35 +0000 |
commit | cfd1157f1123998bde7b93212bdb111a65b82414 (patch) | |
tree | 418f1f7d9a8652ed71e1ffbef0afbb59281111a3 /compile.c | |
parent | a9c0cf4ff06ecbda16b1fcf9d16cb252becd9453 (diff) | |
download | ruby-cfd1157f1123998bde7b93212bdb111a65b82414.tar.gz |
* iseq.h: introduce ISEQ_ORIGINAL_ISEQ() and
ISEQ_ORIGINAL_ISEQ_ALLOC() macro.
* compile.c: use them to access original iseq buffer.
* iseq.c: ditto.
* vm_core.h: rename iseq field to support this fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -641,26 +641,26 @@ rb_vm_insn_addr2insn(const void *addr) /* cold path */ VALUE * rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */ { - if (iseq->variable_body->iseq) return iseq->variable_body->iseq; + VALUE *original_code; - iseq->variable_body->iseq = ALLOC_N(VALUE, iseq->body->iseq_size); - - MEMCPY(iseq->variable_body->iseq, iseq->body->iseq_encoded, VALUE, iseq->body->iseq_size); + if (ISEQ_ORIGINAL_ISEQ(iseq)) return ISEQ_ORIGINAL_ISEQ(iseq); + original_code = ISEQ_ORIGINAL_ISEQ_ALLOC(iseq, iseq->body->iseq_size); + MEMCPY(ISEQ_ORIGINAL_ISEQ(iseq), iseq->body->iseq_encoded, VALUE, iseq->body->iseq_size); #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE { unsigned int i; for (i = 0; i < iseq->body->iseq_size; /* */ ) { - const void *addr = (const void *)iseq->variable_body->iseq[i]; + const void *addr = (const void *)original_code[i]; const int insn = rb_vm_insn_addr2insn(addr); - iseq->variable_body->iseq[i] = insn; + original_code[i] = insn; i += insn_len(insn); } } #endif - return iseq->variable_body->iseq; + return original_code; } /*********************************************/ |