29 files changed, 67 insertions, 87 deletions
diff --git a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
index b61773487..7edf21e8a 100644
--- a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
+++ b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/attribute.cpp b/src/shader_recompiler/frontend/ir/attribute.cpp
index 4d0b8b8e5..7d3d882e4 100644
--- a/src/shader_recompiler/frontend/ir/attribute.cpp
+++ b/src/shader_recompiler/frontend/ir/attribute.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <fmt/format.h>
diff --git a/src/shader_recompiler/frontend/ir/attribute.h b/src/shader_recompiler/frontend/ir/attribute.h
index 3bbd38a03..6ee3947b1 100644
--- a/src/shader_recompiler/frontend/ir/attribute.h
+++ b/src/shader_recompiler/frontend/ir/attribute.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/basic_block.cpp b/src/shader_recompiler/frontend/ir/basic_block.cpp
index a1472cb76..14293770e 100644
--- a/src/shader_recompiler/frontend/ir/basic_block.cpp
+++ b/src/shader_recompiler/frontend/ir/basic_block.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <initializer_list>
diff --git a/src/shader_recompiler/frontend/ir/basic_block.h b/src/shader_recompiler/frontend/ir/basic_block.h
index fbfe98266..c9d83661a 100644
--- a/src/shader_recompiler/frontend/ir/basic_block.h
+++ b/src/shader_recompiler/frontend/ir/basic_block.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/breadth_first_search.h b/src/shader_recompiler/frontend/ir/breadth_first_search.h
index a52ccbd58..ec5542554 100644
--- a/src/shader_recompiler/frontend/ir/breadth_first_search.h
+++ b/src/shader_recompiler/frontend/ir/breadth_first_search.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/condition.cpp b/src/shader_recompiler/frontend/ir/condition.cpp
index fc18ea2a2..fb6b141d3 100644
--- a/src/shader_recompiler/frontend/ir/condition.cpp
+++ b/src/shader_recompiler/frontend/ir/condition.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <string>
diff --git a/src/shader_recompiler/frontend/ir/condition.h b/src/shader_recompiler/frontend/ir/condition.h
index 2f8c10e71..1cad46b9b 100644
--- a/src/shader_recompiler/frontend/ir/condition.h
+++ b/src/shader_recompiler/frontend/ir/condition.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/flow_test.cpp b/src/shader_recompiler/frontend/ir/flow_test.cpp
index 6ebb4ad89..a859efdde 100644
--- a/src/shader_recompiler/frontend/ir/flow_test.cpp
+++ b/src/shader_recompiler/frontend/ir/flow_test.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <string>
diff --git a/src/shader_recompiler/frontend/ir/flow_test.h b/src/shader_recompiler/frontend/ir/flow_test.h
index 09e113773..88f7c9e82 100644
--- a/src/shader_recompiler/frontend/ir/flow_test.h
+++ b/src/shader_recompiler/frontend/ir/flow_test.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.cpp b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
index 356f889ac..d2b658bca 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.cpp
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "common/bit_cast.h"
 #include "shader_recompiler/frontend/ir/ir_emitter.h"
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.h b/src/shader_recompiler/frontend/ir/ir_emitter.h
index 13eefa88b..c29bda558 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.h
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/microinstruction.cpp b/src/shader_recompiler/frontend/ir/microinstruction.cpp
index 631446cf7..468782eb1 100644
--- a/src/shader_recompiler/frontend/ir/microinstruction.cpp
+++ b/src/shader_recompiler/frontend/ir/microinstruction.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
 #include <memory>
@@ -326,6 +325,11 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
    phi_args.emplace_back(predecessor, value);
 }
+void Inst::ErasePhiOperand(size_t index) {
+    const auto operand_it{phi_args.begin() + static_cast<ptrdiff_t>(index)};
+    phi_args.erase(operand_it);
+}
 void Inst::OrderPhiArgs() {
    if (op != Opcode::Phi) {
        throw LogicError("{} is not a Phi instruction", op);
diff --git a/src/shader_recompiler/frontend/ir/modifiers.h b/src/shader_recompiler/frontend/ir/modifiers.h
index 77cda1f8a..69035d462 100644
--- a/src/shader_recompiler/frontend/ir/modifiers.h
+++ b/src/shader_recompiler/frontend/ir/modifiers.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/opcodes.cpp b/src/shader_recompiler/frontend/ir/opcodes.cpp
index 5baa6792f..9e4d9e65a 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.cpp
+++ b/src/shader_recompiler/frontend/ir/opcodes.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "shader_recompiler/frontend/ir/opcodes.h"
diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h
index 85f7aac02..d17dc0376 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.h
+++ b/src/shader_recompiler/frontend/ir/opcodes.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc
index efb6bfac3..86410ddfc 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.inc
+++ b/src/shader_recompiler/frontend/ir/opcodes.inc
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 //     opcode name,                                         return type,    arg1 type,      arg2 type,      arg3 type,      arg4 type,      arg4 type,      ...
 OPCODE(Phi,                                                 Opaque,                                                                                         )
diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp
index 4c956a970..b0707d85a 100644
--- a/src/shader_recompiler/frontend/ir/patch.cpp
+++ b/src/shader_recompiler/frontend/ir/patch.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "shader_recompiler/exception.h"
 #include "shader_recompiler/frontend/ir/patch.h"
diff --git a/src/shader_recompiler/frontend/ir/patch.h b/src/shader_recompiler/frontend/ir/patch.h
index 6d66ff0d6..1e37c8eb6 100644
--- a/src/shader_recompiler/frontend/ir/patch.h
+++ b/src/shader_recompiler/frontend/ir/patch.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/post_order.cpp b/src/shader_recompiler/frontend/ir/post_order.cpp
index 16bc44101..f526615fc 100644
--- a/src/shader_recompiler/frontend/ir/post_order.cpp
+++ b/src/shader_recompiler/frontend/ir/post_order.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <algorithm>
diff --git a/src/shader_recompiler/frontend/ir/post_order.h b/src/shader_recompiler/frontend/ir/post_order.h
index 07bfbadc3..d93071b07 100644
--- a/src/shader_recompiler/frontend/ir/post_order.h
+++ b/src/shader_recompiler/frontend/ir/post_order.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/pred.h b/src/shader_recompiler/frontend/ir/pred.h
index 4e7f32423..a77c1e2a7 100644
--- a/src/shader_recompiler/frontend/ir/pred.h
+++ b/src/shader_recompiler/frontend/ir/pred.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/program.cpp b/src/shader_recompiler/frontend/ir/program.cpp
index 3fc06f855..bda56ff46 100644
--- a/src/shader_recompiler/frontend/ir/program.cpp
+++ b/src/shader_recompiler/frontend/ir/program.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <map>
 #include <string>
diff --git a/src/shader_recompiler/frontend/ir/program.h b/src/shader_recompiler/frontend/ir/program.h
index ebcaa8bc2..6b4a05c59 100644
--- a/src/shader_recompiler/frontend/ir/program.h
+++ b/src/shader_recompiler/frontend/ir/program.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/reg.h b/src/shader_recompiler/frontend/ir/reg.h
index a4b635792..f7cb716a9 100644
--- a/src/shader_recompiler/frontend/ir/reg.h
+++ b/src/shader_recompiler/frontend/ir/reg.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/type.cpp b/src/shader_recompiler/frontend/ir/type.cpp
index f28341bfe..32657cb05 100644
--- a/src/shader_recompiler/frontend/ir/type.cpp
+++ b/src/shader_recompiler/frontend/ir/type.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include <array>
 #include <string>
diff --git a/src/shader_recompiler/frontend/ir/type.h b/src/shader_recompiler/frontend/ir/type.h
index 294b230c4..04c8c4ddb 100644
--- a/src/shader_recompiler/frontend/ir/type.h
+++ b/src/shader_recompiler/frontend/ir/type.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
diff --git a/src/shader_recompiler/frontend/ir/value.cpp b/src/shader_recompiler/frontend/ir/value.cpp
index 0248d9c6e..346169328 100644
--- a/src/shader_recompiler/frontend/ir/value.cpp
+++ b/src/shader_recompiler/frontend/ir/value.cpp
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #include "shader_recompiler/frontend/ir/value.h"
diff --git a/src/shader_recompiler/frontend/ir/value.h b/src/shader_recompiler/frontend/ir/value.h
index 947579852..1a2e4ccb6 100644
--- a/src/shader_recompiler/frontend/ir/value.h
+++ b/src/shader_recompiler/frontend/ir/value.h
@@ -1,6 +1,5 @@
-// Copyright 2021 yuzu Emulator Project
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
-// Licensed under GPLv2 or any later version
+// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included.
 #pragma once
@@ -179,9 +178,13 @@ public:
    /// Get a pointer to the block of a phi argument.
    [[nodiscard]] Block* PhiBlock(size_t index) const;
    /// Add phi operand to a phi instruction.
    void AddPhiOperand(Block* predecessor, const Value& value);
+    // Erase the phi operand at the given index.
+    void ErasePhiOperand(size_t index);
    /// Orders the Phi arguments from farthest away to nearest.
    void OrderPhiArgs();

diff --git a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h index b61773487..7edf21e8a 100644 --- a/src/shader_recompiler/frontend/ir/abstract_syntax_list.h +++ b/src/shader_recompiler/frontend/ir/abstract_syntax_list.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/attribute.cpp b/src/shader_recompiler/frontend/ir/attribute.cpp index 4d0b8b8e5..7d3d882e4 100644 --- a/src/shader_recompiler/frontend/ir/attribute.cpp +++ b/src/shader_recompiler/frontend/ir/attribute.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <fmt/format.h>	4	#include <fmt/format.h>
6		5


diff --git a/src/shader_recompiler/frontend/ir/attribute.h b/src/shader_recompiler/frontend/ir/attribute.h index 3bbd38a03..6ee3947b1 100644 --- a/src/shader_recompiler/frontend/ir/attribute.h +++ b/src/shader_recompiler/frontend/ir/attribute.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/basic_block.cpp b/src/shader_recompiler/frontend/ir/basic_block.cpp index a1472cb76..14293770e 100644 --- a/src/shader_recompiler/frontend/ir/basic_block.cpp +++ b/src/shader_recompiler/frontend/ir/basic_block.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <algorithm>	4	#include <algorithm>
6	#include <initializer_list>	5	#include <initializer_list>


diff --git a/src/shader_recompiler/frontend/ir/basic_block.h b/src/shader_recompiler/frontend/ir/basic_block.h index fbfe98266..c9d83661a 100644 --- a/src/shader_recompiler/frontend/ir/basic_block.h +++ b/src/shader_recompiler/frontend/ir/basic_block.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/breadth_first_search.h b/src/shader_recompiler/frontend/ir/breadth_first_search.h index a52ccbd58..ec5542554 100644 --- a/src/shader_recompiler/frontend/ir/breadth_first_search.h +++ b/src/shader_recompiler/frontend/ir/breadth_first_search.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/condition.cpp b/src/shader_recompiler/frontend/ir/condition.cpp index fc18ea2a2..fb6b141d3 100644 --- a/src/shader_recompiler/frontend/ir/condition.cpp +++ b/src/shader_recompiler/frontend/ir/condition.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <string>	4	#include <string>
6		5


diff --git a/src/shader_recompiler/frontend/ir/condition.h b/src/shader_recompiler/frontend/ir/condition.h index 2f8c10e71..1cad46b9b 100644 --- a/src/shader_recompiler/frontend/ir/condition.h +++ b/src/shader_recompiler/frontend/ir/condition.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/flow_test.cpp b/src/shader_recompiler/frontend/ir/flow_test.cpp index 6ebb4ad89..a859efdde 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.cpp +++ b/src/shader_recompiler/frontend/ir/flow_test.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <string>	4	#include <string>
6		5


diff --git a/src/shader_recompiler/frontend/ir/flow_test.h b/src/shader_recompiler/frontend/ir/flow_test.h index 09e113773..88f7c9e82 100644 --- a/src/shader_recompiler/frontend/ir/flow_test.h +++ b/src/shader_recompiler/frontend/ir/flow_test.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.cpp b/src/shader_recompiler/frontend/ir/ir_emitter.cpp index 356f889ac..d2b658bca 100644 --- a/src/shader_recompiler/frontend/ir/ir_emitter.cpp +++ b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include "common/bit_cast.h"	4	#include "common/bit_cast.h"
6	#include "shader_recompiler/frontend/ir/ir_emitter.h"	5	#include "shader_recompiler/frontend/ir/ir_emitter.h"


diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.h b/src/shader_recompiler/frontend/ir/ir_emitter.h index 13eefa88b..c29bda558 100644 --- a/src/shader_recompiler/frontend/ir/ir_emitter.h +++ b/src/shader_recompiler/frontend/ir/ir_emitter.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/microinstruction.cpp b/src/shader_recompiler/frontend/ir/microinstruction.cpp index 631446cf7..468782eb1 100644 --- a/src/shader_recompiler/frontend/ir/microinstruction.cpp +++ b/src/shader_recompiler/frontend/ir/microinstruction.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <algorithm>	4	#include <algorithm>
6	#include <memory>	5	#include <memory>
@@ -326,6 +325,11 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
326	phi_args.emplace_back(predecessor, value);	325	phi_args.emplace_back(predecessor, value);
327	}	326	}
328		327
		328	void Inst::ErasePhiOperand(size_t index) {
		329	const auto operand_it{phi_args.begin() + static_cast<ptrdiff_t>(index)};
		330	phi_args.erase(operand_it);
		331	}
		332
329	void Inst::OrderPhiArgs() {	333	void Inst::OrderPhiArgs() {
330	if (op != Opcode::Phi) {	334	if (op != Opcode::Phi) {
331	throw LogicError("{} is not a Phi instruction", op);	335	throw LogicError("{} is not a Phi instruction", op);


diff --git a/src/shader_recompiler/frontend/ir/modifiers.h b/src/shader_recompiler/frontend/ir/modifiers.h index 77cda1f8a..69035d462 100644 --- a/src/shader_recompiler/frontend/ir/modifiers.h +++ b/src/shader_recompiler/frontend/ir/modifiers.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/opcodes.cpp b/src/shader_recompiler/frontend/ir/opcodes.cpp index 5baa6792f..9e4d9e65a 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.cpp +++ b/src/shader_recompiler/frontend/ir/opcodes.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include "shader_recompiler/frontend/ir/opcodes.h"	4	#include "shader_recompiler/frontend/ir/opcodes.h"
6		5


diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h index 85f7aac02..d17dc0376 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.h +++ b/src/shader_recompiler/frontend/ir/opcodes.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/opcodes.inc b/src/shader_recompiler/frontend/ir/opcodes.inc index efb6bfac3..86410ddfc 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.inc +++ b/src/shader_recompiler/frontend/ir/opcodes.inc
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	// opcode name, return type, arg1 type, arg2 type, arg3 type, arg4 type, arg4 type, ...	4	// opcode name, return type, arg1 type, arg2 type, arg3 type, arg4 type, arg4 type, ...
6	OPCODE(Phi, Opaque, )	5	OPCODE(Phi, Opaque, )


diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp index 4c956a970..b0707d85a 100644 --- a/src/shader_recompiler/frontend/ir/patch.cpp +++ b/src/shader_recompiler/frontend/ir/patch.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include "shader_recompiler/exception.h"	4	#include "shader_recompiler/exception.h"
6	#include "shader_recompiler/frontend/ir/patch.h"	5	#include "shader_recompiler/frontend/ir/patch.h"


diff --git a/src/shader_recompiler/frontend/ir/patch.h b/src/shader_recompiler/frontend/ir/patch.h index 6d66ff0d6..1e37c8eb6 100644 --- a/src/shader_recompiler/frontend/ir/patch.h +++ b/src/shader_recompiler/frontend/ir/patch.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/post_order.cpp b/src/shader_recompiler/frontend/ir/post_order.cpp index 16bc44101..f526615fc 100644 --- a/src/shader_recompiler/frontend/ir/post_order.cpp +++ b/src/shader_recompiler/frontend/ir/post_order.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <algorithm>	4	#include <algorithm>
6		5


diff --git a/src/shader_recompiler/frontend/ir/post_order.h b/src/shader_recompiler/frontend/ir/post_order.h index 07bfbadc3..d93071b07 100644 --- a/src/shader_recompiler/frontend/ir/post_order.h +++ b/src/shader_recompiler/frontend/ir/post_order.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/pred.h b/src/shader_recompiler/frontend/ir/pred.h index 4e7f32423..a77c1e2a7 100644 --- a/src/shader_recompiler/frontend/ir/pred.h +++ b/src/shader_recompiler/frontend/ir/pred.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/program.cpp b/src/shader_recompiler/frontend/ir/program.cpp index 3fc06f855..bda56ff46 100644 --- a/src/shader_recompiler/frontend/ir/program.cpp +++ b/src/shader_recompiler/frontend/ir/program.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <map>	4	#include <map>
6	#include <string>	5	#include <string>


diff --git a/src/shader_recompiler/frontend/ir/program.h b/src/shader_recompiler/frontend/ir/program.h index ebcaa8bc2..6b4a05c59 100644 --- a/src/shader_recompiler/frontend/ir/program.h +++ b/src/shader_recompiler/frontend/ir/program.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/reg.h b/src/shader_recompiler/frontend/ir/reg.h index a4b635792..f7cb716a9 100644 --- a/src/shader_recompiler/frontend/ir/reg.h +++ b/src/shader_recompiler/frontend/ir/reg.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/type.cpp b/src/shader_recompiler/frontend/ir/type.cpp index f28341bfe..32657cb05 100644 --- a/src/shader_recompiler/frontend/ir/type.cpp +++ b/src/shader_recompiler/frontend/ir/type.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include <array>	4	#include <array>
6	#include <string>	5	#include <string>


diff --git a/src/shader_recompiler/frontend/ir/type.h b/src/shader_recompiler/frontend/ir/type.h index 294b230c4..04c8c4ddb 100644 --- a/src/shader_recompiler/frontend/ir/type.h +++ b/src/shader_recompiler/frontend/ir/type.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5


diff --git a/src/shader_recompiler/frontend/ir/value.cpp b/src/shader_recompiler/frontend/ir/value.cpp index 0248d9c6e..346169328 100644 --- a/src/shader_recompiler/frontend/ir/value.cpp +++ b/src/shader_recompiler/frontend/ir/value.cpp
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#include "shader_recompiler/frontend/ir/value.h"	4	#include "shader_recompiler/frontend/ir/value.h"
6		5


diff --git a/src/shader_recompiler/frontend/ir/value.h b/src/shader_recompiler/frontend/ir/value.h index 947579852..1a2e4ccb6 100644 --- a/src/shader_recompiler/frontend/ir/value.h +++ b/src/shader_recompiler/frontend/ir/value.h
@@ -1,6 +1,5 @@
1	// Copyright 2021 yuzu Emulator Project	1	// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
2	// Licensed under GPLv2 or any later version	2	// SPDX-License-Identifier: GPL-2.0-or-later
3	// Refer to the license.txt file included.
4		3
5	#pragma once	4	#pragma once
6		5
@@ -179,9 +178,13 @@ public:
179		178
180	/// Get a pointer to the block of a phi argument.	179	/// Get a pointer to the block of a phi argument.
181	[[nodiscard]] Block* PhiBlock(size_t index) const;	180	[[nodiscard]] Block* PhiBlock(size_t index) const;
		181
182	/// Add phi operand to a phi instruction.	182	/// Add phi operand to a phi instruction.
183	void AddPhiOperand(Block* predecessor, const Value& value);	183	void AddPhiOperand(Block* predecessor, const Value& value);
184		184
		185	// Erase the phi operand at the given index.
		186	void ErasePhiOperand(size_t index);
		187
185	/// Orders the Phi arguments from farthest away to nearest.	188	/// Orders the Phi arguments from farthest away to nearest.
186	void OrderPhiArgs();	189	void OrderPhiArgs();
187		190