Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix small chunk finaliser bug #2257

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Fix small chunk finaliser bug #2257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/libponyrt/mem/heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ static void final_small(chunk_t* chunk, uint32_t mark)
uint64_t bit = 0;

// if there's a finaliser to run for a used slot
while((finalisers != 0) && (0 != (bit = __pony_ctzl(finalisers))))
while(finalisers != 0)
{
bit = __pony_ctzl(finalisers);
p = chunk->m + (bit << HEAP_MINBITS);

// run finaliser
Expand All @@ -108,8 +109,9 @@ static void final_small_freed(chunk_t* chunk)
uint64_t bit = 0;

// if there's a finaliser to run for a used slot
while((finalisers != 0) && (0 != (bit = __pony_ctzl(finalisers))))
while(finalisers != 0)
{
bit = __pony_ctzl(finalisers);
p = chunk->m + (bit << HEAP_MINBITS);

// run finaliser
Expand All @@ -126,6 +128,7 @@ static void final_large(chunk_t* chunk, uint32_t mark)
if(chunk->finalisers == 1)
{
// run finaliser
pony_assert((*(pony_type_t**)chunk->m)->final != NULL);
(*(pony_type_t**)chunk->m)->final(chunk->m);
chunk->finalisers = 0;
}
Expand Down
38 changes: 38 additions & 0 deletions test/libponyc/codegen.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,44 @@ TEST_F(CodegenTest, BoxBoolAsUnionIntoTuple)
}


extern "C"
{

uint32_t num_objects = 0;

EXPORT_SYMBOL void codegentest_small_finalisers_increment_num_objects() {
num_objects++;
pony_exitcode(num_objects);
}

}


TEST_F(CodegenTest, SmallFinalisers)
{
const char* src =
"use \"collections\"\n"

"class _Final\n"
" fun _final() =>\n"
" @codegentest_small_finalisers_increment_num_objects[None]()\n"

"actor Main\n"
" new create(env: Env) =>\n"
" for i in Range[I32](0, 42) do\n"
" _Final\n"
" end\n";

set_builtin(NULL);

TEST_COMPILE(src);

int exit_code = 0;
ASSERT_TRUE(run_program(&exit_code));
ASSERT_EQ(exit_code, 42);
}


extern "C"
{

Expand Down