Skip to content

Commit 90e4c9d

Browse files
committed
[NFC] Address more bit-field storage sizes
Follow on work from #139825
1 parent eb467a0 commit 90e4c9d

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

lld/wasm/InputChunks.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ class InputChunk {
9999
// the beginning of the output section this chunk was assigned to.
100100
int32_t outSecOff = 0;
101101

102-
uint8_t sectionKind : 3;
102+
uint32_t sectionKind : 3;
103103

104104
// Signals that the section is part of the output. The garbage collector,
105105
// and COMDAT handling can set a sections' Live bit.
106106
// If GC is disabled, all sections start out as live by default.
107-
unsigned live : 1;
107+
uint32_t live : 1;
108108

109109
// Signals the chunk was discarded by COMDAT handling.
110-
unsigned discarded : 1;
110+
uint32_t discarded : 1;
111111

112112
protected:
113113
InputChunk(ObjFile *f, Kind k, StringRef name, uint32_t alignment = 0,

lldb/source/Plugins/Language/ObjC/NSArray.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ namespace Foundation1010 {
101101
uint32_t _used;
102102
uint32_t _offset;
103103
uint32_t _size : 28;
104-
uint64_t _priv1 : 4;
104+
uint32_t _priv1 : 4;
105105
uint32_t _priv2;
106106
uint32_t _data;
107107
};

lldb/source/Plugins/Language/ObjC/NSDictionary.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class NSDictionaryISyntheticFrontEnd : public SyntheticChildrenFrontEnd {
119119

120120
struct DataDescriptor_64 {
121121
uint64_t _used : 58;
122-
uint32_t _szidx : 6;
122+
uint64_t _szidx : 6;
123123
};
124124

125125
struct DictionaryItemDescriptor {
@@ -273,7 +273,7 @@ namespace Foundation1100 {
273273

274274
struct DataDescriptor_64 {
275275
uint64_t _used : 58;
276-
uint32_t _kvo : 1;
276+
uint64_t _kvo : 1;
277277
uint64_t _size;
278278
uint64_t _mutations;
279279
uint64_t _objs_addr;
@@ -308,7 +308,7 @@ namespace Foundation1428 {
308308

309309
struct DataDescriptor_64 {
310310
uint64_t _used : 58;
311-
uint32_t _kvo : 1;
311+
uint64_t _kvo : 1;
312312
uint64_t _size;
313313
uint64_t _buffer;
314314
uint64_t GetSize() { return _size; }

lldb/source/Plugins/Language/ObjC/NSSet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class NSSetISyntheticFrontEnd : public SyntheticChildrenFrontEnd {
6262

6363
struct DataDescriptor_64 {
6464
uint64_t _used : 58;
65-
uint32_t _szidx : 6;
65+
uint64_t _szidx : 6;
6666
};
6767

6868
struct SetItemDescriptor {

lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class DWARFDebugInfoEntry {
189189
// If it is zero, then the DIE doesn't have children,
190190
// or the DWARF claimed it had children but the DIE
191191
// only contained a single NULL terminating child.
192-
uint32_t m_sibling_idx : 31, m_has_children : 1;
192+
uint64_t m_sibling_idx : 31, m_has_children : 1;
193193
uint16_t m_abbr_idx = 0;
194194
/// A copy of the DW_TAG value so we don't have to go through the compile
195195
/// unit abbrev table

0 commit comments

Comments
 (0)