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

video_core/ast: Default the move constructor and assignment operator

Browse source 
This is behaviorally equivalent and also fixes a bug where some members
weren't being moved over.
This commit is contained in:
Lioncash 2019-10-05 08:43:44 -04:00
parent 43503a69bf
commit 3a20d9734f
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/video_core/shader/ast.cpp
View file

@ -374,30 +374,6 @@ void ASTManager::Init() {
false_condition = MakeExpr<ExprBoolean>(false);
}
ASTManager::ASTManager(ASTManager&& other) noexcept
: labels_map(std::move(other.labels_map)), labels_count{other.labels_count},
gotos(std::move(other.gotos)), labels(std::move(other.labels)), variables{other.variables},
program{other.program}, main_node{other.main_node}, false_condition{other.false_condition},
disable_else_derivation{other.disable_else_derivation} {
other.main_node.reset();
}
ASTManager& ASTManager::operator=(ASTManager&& other) noexcept {
full_decompile = other.full_decompile;
labels_map = std::move(other.labels_map);
labels_count = other.labels_count;
gotos = std::move(other.gotos);
labels = std::move(other.labels);
variables = other.variables;
program = other.program;
main_node = other.main_node;
false_condition = other.false_condition;
disable_else_derivation = other.disable_else_derivation;
other.main_node.reset();
return *this;
}
void ASTManager::DeclareLabel(u32 address) {
const auto pair = labels_map.emplace(address, labels_count);
if (pair.second) {

4
src/video_core/shader/ast.h
View file

@ -313,8 +313,8 @@ public:
ASTManager(const ASTManager& o) = delete;
ASTManager& operator=(const ASTManager& other) = delete;
ASTManager(ASTManager&& other) noexcept;
ASTManager& operator=(ASTManager&& other) noexcept;
ASTManager(ASTManager&& other) noexcept = default;
ASTManager& operator=(ASTManager&& other) noexcept = default;
void Init();