flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #770 from lioncash/construct

Browse source 
gl_shader_decompiler: Remove redundant Subroutine construction in AddSubroutine()
This commit is contained in:
bunnei 2018-07-22 10:24:20 -07:00 committed by GitHub
commit 3618a68f93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -78,14 +78,18 @@ private:
/// Adds and analyzes a new subroutine if it is not added yet. /// Adds and analyzes a new subroutine if it is not added yet.
const Subroutine& AddSubroutine(u32 begin, u32 end, const std::string& suffix) { const Subroutine& AddSubroutine(u32 begin, u32 end, const std::string& suffix) {
auto iter = subroutines.find(Subroutine{begin, end, suffix}); Subroutine subroutine{begin, end, suffix, ExitMethod::Undetermined, {}};
if (iter != subroutines.end())
return *iter; const auto iter = subroutines.find(subroutine);
if (iter != subroutines.end()) {
return *iter;
}
Subroutine subroutine{begin, end, suffix};
subroutine.exit_method = Scan(begin, end, subroutine.labels); subroutine.exit_method = Scan(begin, end, subroutine.labels);
if (subroutine.exit_method == ExitMethod::Undetermined) if (subroutine.exit_method == ExitMethod::Undetermined) {
throw DecompileFail("Recursive function detected"); throw DecompileFail("Recursive function detected");
}
return *subroutines.insert(std::move(subroutine)).first; return *subroutines.insert(std::move(subroutine)).first;
} }