AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 19:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Erase decorations removed from internal collections

Browse Source 
Fixes Android arm-64-v8a build with NDK r14.  That's because
we no longer ignore the result of the std::remove.
This commit is contained in:
David Neto 2017-11-29 15:58:35 -05:00
parent 3c2e4c7d99
commit 188cd3780d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/opt/decoration_manager.cpp
View File

@ -305,12 +305,13 @@ void DecorationManager::RemoveInstructionFromTarget(ir::Instruction* inst,
const uint32_t target_id) {
auto const group_iter = group_to_decoration_insts_.find(target_id);
if (group_iter != group_to_decoration_insts_.end()) {
remove(group_iter->second.begin(), group_iter->second.end(), inst);
auto& insts = group_iter->second;
insts.erase(std::remove(insts.begin(), insts.end(), inst), insts.end());
} else {
auto target_list_iter = id_to_decoration_insts_.find(target_id);
if (target_list_iter != id_to_decoration_insts_.end()) {
remove(target_list_iter->second.begin(), target_list_iter->second.end(),
inst);
auto& insts = target_list_iter->second;
insts.erase(std::remove(insts.begin(), insts.end(), inst), insts.end());
}
}
}