1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug unnecessarily causing version limit hit

Browse Source
This commit is contained in:
Maxime Chevalier-Boisvert 2021-02-05 15:49:02 -05:00 committed by Alan Wu
parent d2ad0a1175
commit 21c4dd037d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ujit_core.c
View File

@ -148,6 +148,9 @@ int ctx_diff(const ctx_t* src, const ctx_t* dst)
// Add a block version to the map // Add a block version to the map
static void add_block_version(blockid_t blockid, block_t* block) static void add_block_version(blockid_t blockid, block_t* block)
{ {
// Function entry blocks must have stack size 0
RUBY_ASSERT(!(block->blockid.idx == 0 && block->ctx.stack_size > 0));
// If there exists a version for this block id // If there exists a version for this block id
block_t* first_version = NULL; block_t* first_version = NULL;
st_lookup(version_tbl, (st_data_t)&blockid, (st_data_t*)&first_version); st_lookup(version_tbl, (st_data_t)&blockid, (st_data_t*)&first_version);
@ -266,6 +269,9 @@ block_t* gen_block_version(blockid_t blockid, const ctx_t* start_ctx)
rb_bug("invalid target for last branch"); rb_bug("invalid target for last branch");
} }
// Use the context from the branch
*ctx = last_branch->target_ctxs[0];
// Allocate a new block version object // Allocate a new block version object
block = calloc(1, sizeof(block_t)); block = calloc(1, sizeof(block_t));
block->blockid = last_branch->targets[0]; block->blockid = last_branch->targets[0];