Skip to content

Commit e6d559e

Browse files
committed
CI format fix. Assert in runtime.
1 parent 976345a commit e6d559e

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/basic-ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v5
1919

20+
- run: |
21+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
22+
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main" | sudo tee /etc/apt/sources.list.d/llvm-18.list
23+
24+
- name: Install clang-format
25+
run: sudo apt-get install clang-format-18
26+
2027
- name: Format source code
2128
run: |
2229
find demo lib test \

lib/runtime/AllocationTracking.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,18 @@ void __typeart_leave_scope_omp(int alloca_count) {
292292
void __typeart_alloc_mty(const void* addr, const void* info, size_t count) {
293293
TYPEART_RUNTIME_GUARD;
294294
const void* retAddr = __builtin_return_address(0);
295+
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
295296
auto& rt = typeart::RuntimeSystem::get();
296-
const auto type_id = rt.type_translator().get_type_id_for(info);
297+
assert(type_id == rt.type_translator().get_type_id_for(info) && "Type ID of global and lookup must match");
297298
rt.allocation_tracker().onAlloc(addr, type_id, count, retAddr);
298299
}
299300

300301
void __typeart_alloc_stack_mty(const void* addr, const void* info, size_t count) {
301302
TYPEART_RUNTIME_GUARD;
302303
const void* retAddr = __builtin_return_address(0);
303-
304-
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
305-
auto& rt = typeart::RuntimeSystem::get();
306-
// auto stored_id = rt.type_translator().get_type_id_for(info);
307-
// LOG_FATAL(type_id << " vs. " << stored_id)
304+
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
305+
auto& rt = typeart::RuntimeSystem::get();
306+
assert(type_id == rt.type_translator().get_type_id_for(info) && "Type ID of global and lookup must match");
308307
rt.allocation_tracker().onAllocStack(addr, type_id, count, retAddr);
309308
}
310309

@@ -313,6 +312,7 @@ void __typeart_alloc_global_mty(const void* addr, const void* info, size_t count
313312
const void* retAddr = __builtin_return_address(0);
314313
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
315314
auto& rt = typeart::RuntimeSystem::get();
315+
assert(type_id == rt.type_translator().get_type_id_for(info) && "Type ID of global and lookup must match");
316316
rt.allocation_tracker().onAllocGlobal(addr, type_id, count, retAddr);
317317
}
318318

@@ -321,6 +321,7 @@ void __typeart_alloc_omp_mty(const void* addr, const void* info, size_t count) {
321321
const void* retAddr = __builtin_return_address(0);
322322
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
323323
auto& rt = typeart::RuntimeSystem::get();
324+
assert(type_id == rt.type_translator().get_type_id_for(info) && "Type ID of global and lookup must match");
324325
rt.allocation_tracker().onAlloc(addr, type_id, count, retAddr);
325326
}
326327

@@ -329,5 +330,6 @@ void __typeart_alloc_stack_omp_mty(const void* addr, const void* info, size_t co
329330
const void* retAddr = __builtin_return_address(0);
330331
const auto type_id = reinterpret_cast<const typeart::GlobalTypeInfo*>(info)->type_id;
331332
auto& rt = typeart::RuntimeSystem::get();
333+
assert(type_id == rt.type_translator().get_type_id_for(info) && "Type ID of global and lookup must match");
332334
rt.allocation_tracker().onAllocStack(addr, type_id, count, retAddr);
333335
}

0 commit comments

Comments
 (0)