octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3685 from lioncash/copies 

control_flow: Make use of std::move in TryInspectAddress()
This commit is contained in:
Rodrigo Locatti 2020-04-16 01:22:40 -03:00 committed by GitHub
parent 319df1db77 72a224d3fc
commit 612966399b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/shader/control_flow.cpp
View File

@ -484,17 +484,17 @@ bool TryInspectAddress(CFGRebuildState& state) {
} }
case BlockCollision::Inside: { case BlockCollision::Inside: {
// This case is the tricky one: // This case is the tricky one:
// We need to Split the block in 2 sepparate blocks // We need to split the block into 2 separate blocks
const u32 end = state.block_info[block_index].end; const u32 end = state.block_info[block_index].end;
BlockInfo& new_block = CreateBlockInfo(state, address, end); BlockInfo& new_block = CreateBlockInfo(state, address, end);
BlockInfo& current_block = state.block_info[block_index]; BlockInfo& current_block = state.block_info[block_index];
current_block.end = address - 1; current_block.end = address - 1;
new_block.branch = current_block.branch; new_block.branch = std::move(current_block.branch);
BlockBranchInfo forward_branch = MakeBranchInfo<SingleBranch>(); BlockBranchInfo forward_branch = MakeBranchInfo<SingleBranch>();
const auto branch = std::get_if<SingleBranch>(forward_branch.get()); const auto branch = std::get_if<SingleBranch>(forward_branch.get());
branch->address = address; branch->address = address;
branch->ignore = true; branch->ignore = true;
current_block.branch = forward_branch; current_block.branch = std::move(forward_branch);
return true; return true;
} }
default: default: