Skip to content

Commit 3e8464e

Browse files
committed
RemoveIgnored: Set names for removed members to AddPadding::MemberPrefix
This means they will be treated as padding, so CodeGen will not try to store any data for them.
1 parent e7549db commit 3e8464e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ workflows:
2020
- build-gcc
2121
oid_test_args: "-ftype-graph"
2222
tests_regex: "OidIntegration\\..*"
23-
exclude_regex: ".*inheritance_polymorphic.*|.*pointers_incomplete_containing_struct|.*ignored_a|.*arrays_member_int0"
23+
exclude_regex: ".*inheritance_polymorphic.*|.*pointers_incomplete_containing_struct|.*arrays_member_int0"
2424
- test:
2525
name: test-typed-data-segment-gcc
2626
requires:
2727
- build-gcc
2828
oid_test_args: "-ftyped-data-segment"
2929
tests_regex: "OidIntegration\\..*"
30-
exclude_regex: ".*inheritance_polymorphic.*|.*pointers.*|.*ignored_a|.*arrays_member_int0|.*cycles_.*"
30+
exclude_regex: ".*inheritance_polymorphic.*|.*pointers.*|.*arrays_member_int0|.*cycles_.*"
3131
- coverage:
3232
name: coverage
3333
requires:

oi/type_graph/RemoveIgnored.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
#include "RemoveIgnored.h"
1717

18+
#include "AddPadding.h"
1819
#include "TypeGraph.h"
1920

2021
namespace type_graph {
@@ -48,7 +49,7 @@ void RemoveIgnored::visit(Class& c) {
4849
auto& paddingArray =
4950
typeGraph_.makeType<Array>(primitive, c.members[i].type().size());
5051
c.members[i] =
51-
Member{paddingArray, c.members[i].name, c.members[i].bitOffset};
52+
Member{paddingArray, AddPadding::MemberPrefix, c.members[i].bitOffset};
5253
}
5354
}
5455

test/test_remove_ignored.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TEST(RemoveIgnoredTest, Match) {
3131
[0] Class: ClassA (size: 12)
3232
Member: a (offset: 0)
3333
[1] Class: ClassB (size: 4)
34-
Member: b (offset: 4)
34+
Member: __oi_padding (offset: 4)
3535
[2] Array: (length: 4)
3636
Primitive: int8_t
3737
Member: c (offset: 8)

0 commit comments

Comments
 (0)