Skip to content

Commit 2351c3e

Browse files
authored
Release updates (#176)
1 parent 340bcf6 commit 2351c3e

File tree

7 files changed

+126
-106
lines changed

7 files changed

+126
-106
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(typeart
4-
VERSION 2.1
4+
VERSION 2.2
55
HOMEPAGE_URL https://github.com/tudasc/TypeART
66
DESCRIPTION "LLVM-based type and memory allocation tracking sanitizer"
77
)

README.md

Lines changed: 113 additions & 93 deletions
Large diffs are not rendered by default.

lib/runtime/RuntimeInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typeart_status typeart_get_type(const void* addr, typeart_type_info* type_info);
138138
// typeart_status typeart_get_containing_type(const void* addr, int* type_id, size_t* count, const void** base_address,
139139
// size_t* byte_offset);
140140

141-
typeart_status typeart_get_containing_type(typeart_type_info type_info, typeart_base_type_info* containing_type,
141+
typeart_status typeart_get_containing_type(const typeart_type_info* type_info, typeart_base_type_info* containing_type,
142142
size_t* byte_offset);
143143

144144
/**

lib/runtime/TypeResolution.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@ typeart_status typeart_get_type(const void* addr, typeart_type_info* base_type)
359359
return typeart::detail::query_type(addr, *base_type);
360360
}
361361

362-
typeart_status typeart_get_containing_type(typeart_type_info type, typeart_base_type_info* containing_type,
362+
typeart_status typeart_get_containing_type(const typeart_type_info* type, typeart_base_type_info* containing_type,
363363
size_t* byte_offset) {
364364
typeart::RTGuard guard;
365-
containing_type->type_id = type.base_type_info.type_id;
366-
containing_type->count = type.base_type_info.count;
367-
containing_type->address = type.base_type_info.address;
368-
const typeart::PointerInfo info{type.base_type_info.type_id, type.base_type_info.count};
365+
containing_type->type_id = type->base_type_info.type_id;
366+
containing_type->count = type->base_type_info.count;
367+
containing_type->address = type->base_type_info.address;
368+
const typeart::PointerInfo info{type->base_type_info.type_id, type->base_type_info.count};
369369
const auto result = typeart::RuntimeSystem::get().type_resolution().getContainingTypeInfo(
370-
type.address, containing_type->address, info, &containing_type->count, byte_offset);
370+
type->address, containing_type->address, info, &containing_type->count, byte_offset);
371371

372372
return result;
373373
}

test/runtime/38_resolve_struct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void type_check_containing(const void* addr) {
4242
return;
4343
}
4444
typeart_base_type_info containing;
45-
status = typeart_get_containing_type(info, &containing, &offset);
45+
status = typeart_get_containing_type(&info, &containing, &offset);
4646

4747
if (status != TYPEART_OK) {
4848
fprintf(stderr, "[Error]: Status not OK: %i for %p\n", status, addr);

test/runtime/53_get_type.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void type_check_containing(const void* addr) {
5050
return;
5151
}
5252
typeart_base_type_info info_base;
53-
status = typeart_get_containing_type(info, &info_base, &offset);
53+
status = typeart_get_containing_type(&info, &info_base, &offset);
5454

5555
if (status != TYPEART_OK) {
5656
fprintf(stderr, "[Error]: Status not OK: %i for %p\n", status, addr);
@@ -77,7 +77,7 @@ void type_check_sub(const void* addr, size_t offset) {
7777
return;
7878
}
7979
typeart_base_type_info info_base;
80-
status = typeart_get_containing_type(info, &info_base, &offset_containing);
80+
status = typeart_get_containing_type(&info, &info_base, &offset_containing);
8181
if (status != TYPEART_OK) {
8282
fprintf(stderr, "[Error]: with containing type\n");
8383
return;

test/runtime/54_get_type_illegal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void type_check_containing(const void* addr) {
6161
return;
6262
}
6363
typeart_base_type_info info_base;
64-
status = typeart_get_containing_type(info, &info_base, &offset);
64+
status = typeart_get_containing_type(&info, &info_base, &offset);
6565

6666
if (status != TYPEART_OK) {
6767
fprintf(stderr, "[Expected]: Status not OK: %s for %p\n", err_code_to_string(status), addr);
@@ -88,7 +88,7 @@ void type_check_sub(const void* addr, size_t offset) {
8888
return;
8989
}
9090
typeart_base_type_info info_base;
91-
status = typeart_get_containing_type(info, &info_base, &offset_containing);
91+
status = typeart_get_containing_type(&info, &info_base, &offset_containing);
9292
if (status != TYPEART_OK) {
9393
fprintf(stderr, "[Error]: with containing type\n");
9494
return;

0 commit comments

Comments
 (0)