Revert "Userland: static vs non-static constexpr variables"

This reverts commit 800ea8ea969835297dc7e7da345a45b9dc5e751a.

Booting the system no longer worked after these changes.

1 files changed, 5 insertions, 5 deletions

diff --git a/Userland/Libraries/LibX86/Instruction.h b/Userland/Libraries/LibX86/Instruction.h
index f34e63ee53..b65b573e26 100644
--- a/Userland/Libraries/LibX86/Instruction.h
+++ b/Userland/Libraries/LibX86/Instruction.h
@@ -28,9 +28,9 @@ protected:
 
 template<typename T>
 struct TypeTrivia {
-    static constexpr size_t bits = sizeof(T) * 8;
-    static constexpr T sign_bit = 1 << (bits - 1);
-    static constexpr T mask = MakeUnsigned<T>(-1);
+    static const size_t bits = sizeof(T) * 8;
+    static const T sign_bit = 1 << (bits - 1);
+    static const T mask = MakeUnsigned<T>(-1);
 };
 
 template<typename T, typename U>
@@ -159,9 +159,9 @@ enum InstructionFormat {
     OP_NEAR_imm,
 };
 
-struct InstructionDescriptor {
-    static constexpr unsigned CurrentAddressSize = 0xB33FBABE;
+static const unsigned CurrentAddressSize = 0xB33FBABE;
 
+struct InstructionDescriptor {
     InstructionHandler handler { nullptr };
     bool opcode_has_register_index { false };
     const char* mnemonic { nullptr };