From c31a4e9013bbacd17269942648a3f9b7f59a68c2 Mon Sep 17 00:00:00 2001
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
Date: Fri, 21 May 2021 21:09:34 +0430
Subject: [PATCH] LibWasm: Once more fix structured instruction label indices

This finally works correctly. :tm:
---
 .../Libraries/LibWasm/AbstractMachine/Configuration.h  |  2 +-
 .../Libraries/LibWasm/AbstractMachine/Interpreter.cpp  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Userland/Libraries/LibWasm/AbstractMachine/Configuration.h b/Userland/Libraries/LibWasm/AbstractMachine/Configuration.h
index f20c0064384..8299f804207 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/Configuration.h
+++ b/Userland/Libraries/LibWasm/AbstractMachine/Configuration.h
@@ -22,7 +22,7 @@ public:
     {
         m_current_frame = frame.ptr();
         m_stack.push(move(frame));
-        m_stack.push(make<Label>(m_current_frame->arity(), m_current_frame->expression().instructions().size() - 1));
+        m_stack.push(make<Label>(m_current_frame->arity(), m_current_frame->expression().instructions().size()));
     }
     auto& frame() const { return m_current_frame; }
     auto& frame() { return m_current_frame; }
diff --git a/Userland/Libraries/LibWasm/AbstractMachine/Interpreter.cpp b/Userland/Libraries/LibWasm/AbstractMachine/Interpreter.cpp
index 05f2d689177..ccf59c33748 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/Interpreter.cpp
+++ b/Userland/Libraries/LibWasm/AbstractMachine/Interpreter.cpp
@@ -376,7 +376,7 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
         auto& args = instruction.arguments().get<Instruction::StructuredInstructionArgs>();
         if (args.block_type.kind() != BlockType::Empty)
             arity = 1;
-        configuration.stack().push(make<Label>(arity, ip.value()));
+        configuration.stack().push(make<Label>(arity, ip.value() + 1));
         return;
     }
     case Instructions::if_.value(): {
@@ -388,14 +388,16 @@ void Interpreter::interpret(Configuration& configuration, InstructionPointer& ip
         auto entry = configuration.stack().pop();
         auto value = entry.get<NonnullOwnPtr<Value>>()->to<i32>();
         TRAP_IF_NOT(value.has_value());
-        configuration.stack().push(make<Label>(arity, args.end_ip));
+        auto end_label = make<Label>(arity, args.end_ip.value());
         if (value.value() == 0) {
             if (args.else_ip.has_value()) {
                 configuration.ip() = args.else_ip.value();
+                configuration.stack().push(move(end_label));
             } else {
-                configuration.ip() = args.end_ip;
-                configuration.stack().pop();
+                configuration.ip() = args.end_ip.value() + 1;
             }
+        } else {
+            configuration.stack().push(move(end_label));
         }
         return;
     }