File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -1328,20 +1328,22 @@ static void codegenDataGenerate() {
13281328 OutlinedHashTreeRecord globalOutlineRecord;
13291329 StableFunctionMapRecord globalMergeRecord;
13301330 for (ConcatInputSection *isec : inputSections) {
1331- if (isec->getSegName () == segment_names::data &&
1332- isec->getName () == section_names::outlinedHashTree) {
1331+ if (isec->getSegName () != segment_names::data)
1332+ continue ;
1333+ if (isec->getName () == section_names::outlinedHashTree) {
13331334 // Read outlined hash tree from each section.
13341335 OutlinedHashTreeRecord localOutlineRecord;
1336+ // Use a pointer to allow modification by the function.
13351337 auto *data = isec->data .data ();
13361338 localOutlineRecord.deserialize (data);
13371339
13381340 // Merge it to the global hash tree.
13391341 globalOutlineRecord.merge (localOutlineRecord);
13401342 }
1341- if (isec->getSegName () == segment_names::data &&
1342- isec->getName () == section_names::functionmap) {
1343+ if (isec->getName () == section_names::functionMap) {
13431344 // Read stable functions from each section.
13441345 StableFunctionMapRecord localMergeRecord;
1346+ // Use a pointer to allow modification by the function.
13451347 auto *data = isec->data .data ();
13461348 localMergeRecord.deserialize (data);
13471349
Original file line number Diff line number Diff line change @@ -339,7 +339,7 @@ constexpr const char const_[] = "__const";
339339constexpr const char lazySymbolPtr[] = " __la_symbol_ptr" ;
340340constexpr const char lazyBinding[] = " __lazy_binding" ;
341341constexpr const char literals[] = " __literals" ;
342- constexpr const char functionmap [] = " __llvm_merge" ;
342+ constexpr const char functionMap [] = " __llvm_merge" ;
343343constexpr const char moduleInitFunc[] = " __mod_init_func" ;
344344constexpr const char moduleTermFunc[] = " __mod_term_func" ;
345345constexpr const char nonLazySymbolPtr[] = " __nl_symbol_ptr" ;
You can’t perform that action at this time.
0 commit comments