Skip to content

Commit acea6d4

Browse files
committed
[SharedCache] Fix designator order for fields
This apparently is not an issue on LLVM, but GCC and MSVC both seem to dislike this.
1 parent 8dd4e14 commit acea6d4

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

view/sharedcache/core/SharedCache.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ namespace SharedCacheCore {
5151
.MSL(size),
5252
.MSL(loaded),
5353
.MSL(rawViewOffsetIfLoaded),
54+
.headerInitialized = false, // NOTE: I guess this is not stored?
5455
.MSL_CAST(flags, uint64_t, BNSegmentFlag),
5556
};
5657
}
@@ -443,7 +444,7 @@ namespace SharedCacheCore {
443444
MSS_SUBCLASS(symtab);
444445
MSS_SUBCLASS(dysymtab);
445446
MSS_SUBCLASS(dyldInfo);
446-
// MSS_SUBCLASS(routines64);
447+
MSS_SUBCLASS(routines64);
447448
MSS_SUBCLASS(functionStarts);
448449
MSS_SUBCLASS(moduleInitSections);
449450
MSS_SUBCLASS(exportTrie);
@@ -458,8 +459,8 @@ namespace SharedCacheCore {
458459
MSS(dylibs);
459460
MSS_SUBCLASS(buildVersion);
460461
MSS_SUBCLASS(buildToolVersions);
461-
MSS(linkeditPresent);
462462
MSS(exportTriePath);
463+
MSS(linkeditPresent);
463464
MSS(dysymPresent);
464465
MSS(dyldInfoPresent);
465466
MSS(exportTriePresent);
@@ -481,7 +482,7 @@ namespace SharedCacheCore {
481482
.MSL(symtab),
482483
.MSL(dysymtab),
483484
.MSL(dyldInfo),
484-
// .MSL(routines64), // FIXME CRASH but also do we even use this?
485+
.MSL(routines64), // TODO: This supposedly caused a crash on some binary? Need a repro.
485486
.MSL(functionStarts),
486487
.MSL(moduleInitSections),
487488
.MSL(exportTrie),
@@ -496,13 +497,13 @@ namespace SharedCacheCore {
496497
.MSL(dylibs),
497498
.MSL(buildVersion),
498499
.MSL(buildToolVersions),
499-
.MSL(linkeditPresent),
500500
.MSL(exportTriePath),
501+
.MSL(linkeditPresent),
501502
.MSL(dysymPresent),
502503
.MSL(dyldInfoPresent),
503504
.MSL(exportTriePresent),
504505
.MSL(chainedFixupsPresent),
505-
// .MSL(routinesPresent),
506+
.MSL(routinesPresent),
506507
.MSL(functionStartsPresent),
507508
.MSL(relocatable),
508509
};

0 commit comments

Comments
 (0)