This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG67c588c481bb: [lldb] Generalize empty record size
computation to avoid giving empty C++… (authored by teemperor).
Herald added a subscriber: lldb-commits.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D105471/new/
https://reviews.llvm.org/D105471
Files:
lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/test/API/lang/c/sizeof/Makefile
lldb/test/API/lang/c/sizeof/TestCSizeof.py
lldb/test/API/lang/c/sizeof/main.c
lldb/test/API/lang/cpp/sizeof/Makefile
lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
lldb/test/API/lang/cpp/sizeof/main.cpp
Index: lldb/test/API/lang/cpp/sizeof/main.cpp
===================================================================
--- /dev/null
+++ lldb/test/API/lang/cpp/sizeof/main.cpp
@@ -0,0 +1,37 @@
+struct Empty {};
+class EmptyClass {};
+
+struct SingleMember {
+ int i;
+};
+class SingleMemberClass {
+ int i;
+};
+
+struct PaddingMember {
+ int i;
+ char c;
+};
+class PaddingMemberClass {
+ int i;
+ char c;
+};
+
+const unsigned sizeof_empty = sizeof(Empty);
+const unsigned sizeof_empty_class = sizeof(EmptyClass);
+const unsigned sizeof_single = sizeof(SingleMember);
+const unsigned sizeof_single_class = sizeof(SingleMemberClass);
+const unsigned sizeof_padding = sizeof(PaddingMember);
+const unsigned sizeof_padding_class = sizeof(PaddingMemberClass);
+
+int main() {
+ Empty empty;
+ EmptyClass empty_class;
+ SingleMember single;
+ SingleMemberClass single_class;
+ PaddingMember padding;
+ PaddingMemberClass padding_class;
+ // Make sure globals are used.
+ return sizeof_empty + sizeof_empty_class + sizeof_single +
+ sizeof_single_class + sizeof_padding + sizeof_padding_class;
+}
Index: lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
===================================================================
--- /dev/null
+++ lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
@@ -0,0 +1,20 @@
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class TestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def test(self):
+ self.build()
+ self.createTestTarget()
+
+ # Empty structs/classes have size 1 in C++.
+ self.expect_expr("sizeof(Empty) == sizeof_empty", result_value="true")
+ self.expect_expr("sizeof(EmptyClass) == sizeof_empty_class", result_value="true")
+ self.expect_expr("sizeof(SingleMember) == sizeof_single", result_value="true")
+ self.expect_expr("sizeof(SingleMemberClass) == sizeof_single_class", result_value="true")
+ self.expect_expr("sizeof(PaddingMember) == sizeof_padding", result_value="true")
+ self.expect_expr("sizeof(PaddingMemberClass) == sizeof_padding_class", result_value="true")
Index: lldb/test/API/lang/cpp/sizeof/Makefile
===================================================================
--- /dev/null
+++ lldb/test/API/lang/cpp/sizeof/Makefile
@@ -0,0 +1,3 @@
+CXX_SOURCES := main.cpp
+
+include Makefile.rules
Index: lldb/test/API/lang/c/sizeof/main.c
===================================================================
--- /dev/null
+++ lldb/test/API/lang/c/sizeof/main.c
@@ -0,0 +1,21 @@
+struct Empty {};
+struct SingleMember {
+ int i;
+};
+
+struct PaddingMember {
+ int i;
+ char c;
+};
+
+const unsigned sizeof_empty = sizeof(struct Empty);
+const unsigned sizeof_single = sizeof(struct SingleMember);
+const unsigned sizeof_padding = sizeof(struct PaddingMember);
+
+int main() {
+ struct Empty empty;
+ struct SingleMember single;
+ struct PaddingMember padding;
+ // Make sure globals are used.
+ return sizeof_empty + sizeof_single + sizeof_padding;
+}
Index: lldb/test/API/lang/c/sizeof/TestCSizeof.py
===================================================================
--- /dev/null
+++ lldb/test/API/lang/c/sizeof/TestCSizeof.py
@@ -0,0 +1,18 @@
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class TestCase(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def test(self):
+ self.build()
+ self.createTestTarget()
+
+ # Empty structs are not allowed in C, but Clang/GCC allow them and
+ # give them a size of 0.
+ self.expect_expr("sizeof(Empty) == sizeof_empty", result_value="true")
+ self.expect_expr("sizeof(SingleMember) == sizeof_single", result_value="true")
+ self.expect_expr("sizeof(PaddingMember) == sizeof_padding", result_value="true")
Index: lldb/test/API/lang/c/sizeof/Makefile
===================================================================
--- /dev/null
+++ lldb/test/API/lang/c/sizeof/Makefile
@@ -0,0 +1,3 @@
+C_SOURCES := main.c
+
+include Makefile.rules
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -1685,14 +1685,18 @@
die.GetOffset(), attrs.name.GetCString());
}
- if (tag == DW_TAG_structure_type) // this only applies in C
- {
+ // If the byte size of the record is specified then overwrite the size
+ // that would be computed by Clang. This is only needed as LLDB's
+ // TypeSystemClang is always in C++ mode, but some compilers such as
+ // GCC and Clang give empty structs a size of 0 in C mode (in contrast to
+ // the size of 1 for empty structs that would be computed in C++ mode).
+ if (attrs.byte_size) {
clang::RecordDecl *record_decl =
TypeSystemClang::GetAsRecordDecl(clang_type);
-
if (record_decl) {
- GetClangASTImporter().SetRecordLayout(
- record_decl, ClangASTImporter::LayoutInfo());
+ ClangASTImporter::LayoutInfo layout;
+ layout.bit_size = *attrs.byte_size * 8;
+ GetClangASTImporter().SetRecordLayout(record_decl, layout);
}
}
} else if (clang_type_was_created) {
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
