diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-12-05 01:01:34 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-12-05 01:01:34 +0800 |
| commit | 471c00a31dcaa04d4658de9b59fc23b24479d2fd (patch) | |
| tree | b53fb2f431f52002c0a2a908623beaa3c1a929e7 /src/codegen.c | |
| parent | 40bfc86a5e0a1a70f904a080569da9662747181f (diff) | |
| parent | 674c55eb7d0a4338d4500516b6a3e9aba56ee61e (diff) | |
| download | mruby-471c00a31dcaa04d4658de9b59fc23b24479d2fd.tar.gz mruby-471c00a31dcaa04d4658de9b59fc23b24479d2fd.zip | |
Merge remote-tracking branch 'mruby/master' into mrbgems
Diffstat (limited to 'src/codegen.c')
| -rw-r--r-- | src/codegen.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/codegen.c b/src/codegen.c index 1e468867c..a6c94d871 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -2079,6 +2079,10 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv) p->nlocals = p->sp; p->ai = mrb->arena_idx; + //because of a potential bad memory access in case of gc let's allocate the irep right now + mrb_add_irep(mrb, mrb->irep_len); + mrb->irep[mrb->irep_len] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); + mrb->irep[mrb->irep_len]->plen = 0; p->idx = mrb->irep_len++; p->filename = prev->filename; if (p->filename) { @@ -2092,10 +2096,12 @@ scope_finish(codegen_scope *s, int idx) { mrb_state *mrb = s->mrb; mrb_irep *irep; - - mrb_add_irep(mrb, idx); - irep = mrb->irep[idx] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); - + + //Comment out these instructions already done in scope_new + //mrb_add_irep(mrb, idx); + //irep = mrb->irep[idx] = (mrb_irep *)mrb_malloc(mrb, sizeof(mrb_irep)); + irep = mrb->irep[idx]; + irep->flags = 0; irep->idx = idx; if (s->iseq) { |