Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 3 deletions src/snmalloc/mem/corealloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,8 @@ namespace snmalloc
smallsizeclass_t sizeclass,
freelist::Iter<>* fl,
size_t size) SNMALLOC_FAST_PATH_LAMBDA {
return alloc->small_refill<Conts, CheckInit>(sizeclass, *fl, size);
return alloc->template small_refill<Conts, CheckInit>(
sizeclass, *fl, size);
},
this,
sizeclass,
Expand Down Expand Up @@ -693,7 +694,7 @@ namespace snmalloc
// Deal with alloc zero of with a small object here.
// Alternative semantics giving nullptr is also allowed by the
// standard.
return self->small_alloc<Conts, CheckInit>(1);
return self->template small_alloc<Conts, CheckInit>(1);
}

return self->template handle_message_queue<noexcept(Conts::failure(0))>(
Expand Down Expand Up @@ -891,7 +892,7 @@ namespace snmalloc
return ticker.check_tick(r);
},
[](Allocator* a, size_t size) SNMALLOC_FAST_PATH_LAMBDA {
return a->small_alloc<Conts, CheckInitNoOp>(size);
return a->template small_alloc<Conts, CheckInitNoOp>(size);
},
size);
}
Expand Down
6 changes: 6 additions & 0 deletions src/test/snmalloc_testlib.cc
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ namespace snmalloc
{
Aal::pause();
}

// Force-emit message_impl's COMDAT here so testlib-only tests (redblack,
// seqset) that see only its non-inline declaration can link. volatile keeps
// the odr-use non-elidable.
[[maybe_unused]] static void (*volatile force_message_impl)(
const char* const) = &message_impl;
} // namespace snmalloc

// -- override/malloc.cc symbols with testlib_ prefix -----------------------
Expand Down
Loading