diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-15 04:08:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-15 04:08:19 +0000 |
commit | 49e78d2666c6a2c6b3c9e156d015f359c5255626 (patch) | |
tree | e0ea695214b7f89e1a380ececcb0d027c226d8c3 | |
parent | 0a35b74dabc1e3028350db08398b0e52ed45db93 (diff) | |
parent | 18374a53dc8e00ec3667b4e1a257c9b4e41f007f (diff) | |
download | mclinker-android13-security-release.tar.gz |
Snap for 8082780 from 18374a53dc8e00ec3667b4e1a257c9b4e41f007f to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: Ic8c5f6587cddb12861d2868ae4a6d7ec26c134ab
-rw-r--r-- | lib/LD/IdenticalCodeFolding.cpp | 3 | ||||
-rw-r--r-- | lib/Object/SectionMap.cpp | 3 | ||||
-rw-r--r-- | lib/Script/Assignment.cpp | 12 |
3 files changed, 6 insertions, 12 deletions
diff --git a/lib/LD/IdenticalCodeFolding.cpp b/lib/LD/IdenticalCodeFolding.cpp index 5ba0fc1..a899bb0 100644 --- a/lib/LD/IdenticalCodeFolding.cpp +++ b/lib/LD/IdenticalCodeFolding.cpp @@ -126,8 +126,7 @@ void IdenticalCodeFolding::findCandidates(FoldingCandidates& pCandidateList) { for (sect = (*obj)->context()->sectBegin(); sect != sectEnd; ++sect) { switch ((*sect)->kind()) { case LDFileFormat::TEXT: { - candidate_map.insert( - std::make_pair(*sect, reinterpret_cast<LDSection*>(NULL))); + candidate_map.insert(std::make_pair(*sect, nullptr)); break; } case LDFileFormat::Relocation: { diff --git a/lib/Object/SectionMap.cpp b/lib/Object/SectionMap.cpp index 615c493..9cba895 100644 --- a/lib/Object/SectionMap.cpp +++ b/lib/Object/SectionMap.cpp @@ -193,8 +193,7 @@ SectionMap::mapping SectionMap::find(const std::string& pInputFile, return std::make_pair(*out, *in); } } - return std::make_pair(reinterpret_cast<Output*>(NULL), - reinterpret_cast<Input*>(NULL)); + return std::make_pair(nullptr, nullptr); } SectionMap::const_iterator SectionMap::find( diff --git a/lib/Script/Assignment.cpp b/lib/Script/Assignment.cpp index 333b366..1df7817 100644 --- a/lib/Script/Assignment.cpp +++ b/lib/Script/Assignment.cpp @@ -80,8 +80,7 @@ void Assignment::activate(Module& pModule) { switch (m_Level) { case OUTSIDE_SECTIONS: assert(!isLhsDot); - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); break; case OUTPUT_SECTION: { @@ -122,8 +121,7 @@ void Assignment::activate(Module& pModule) { if (isLhsDot) { out->dotAssignments().push_back(*this); } else { - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); } break; } @@ -138,8 +136,7 @@ void Assignment::activate(Module& pModule) { in->getSection()->getSectionData()->front()); Assignment assign( INPUT_SECTION, HIDDEN, *SymOperand::create("."), *expr); - in->dotAssignments().push_back( - std::make_pair(reinterpret_cast<Fragment*>(NULL), assign)); + in->dotAssignments().push_back(std::make_pair(nullptr, assign)); } Assignment& prevDotAssign = in->dotAssignments().back().second; @@ -158,8 +155,7 @@ void Assignment::activate(Module& pModule) { in->dotAssignments().push_back(std::make_pair( in->getSection()->getSectionData()->front().getNextNode(), *this)); } else { - script.assignments().push_back( - std::make_pair(reinterpret_cast<LDSymbol*>(NULL), *this)); + script.assignments().push_back(std::make_pair(nullptr, *this)); } break; } |