diff --git a/src/asmjit/arm/a64assembler.h b/src/asmjit/arm/a64assembler.h
index f0a40e7..f9eb9d4 100644
--- a/src/asmjit/arm/a64assembler.h
+++ b/src/asmjit/arm/a64assembler.h
@@ -27,7 +27,7 @@ public:
   //! \{
 
   ASMJIT_API Assembler(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Assembler() noexcept;
+  ASMJIT_API ~Assembler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/arm/a64builder.h b/src/asmjit/arm/a64builder.h
index adc99aa..cab1083 100644
--- a/src/asmjit/arm/a64builder.h
+++ b/src/asmjit/arm/a64builder.h
@@ -29,7 +29,7 @@ public:
   //! \{
 
   ASMJIT_API explicit Builder(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Builder() noexcept;
+  ASMJIT_API ~Builder() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/arm/a64compiler.h b/src/asmjit/arm/a64compiler.h
index e0d4177..c0b3867 100644
--- a/src/asmjit/arm/a64compiler.h
+++ b/src/asmjit/arm/a64compiler.h
@@ -30,7 +30,7 @@ public:
   //! \{
 
   ASMJIT_API explicit Compiler(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Compiler() noexcept;
+  ASMJIT_API ~Compiler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/arm/a64rapass_p.h b/src/asmjit/arm/a64rapass_p.h
index ab0dfd6..7313087 100644
--- a/src/asmjit/arm/a64rapass_p.h
+++ b/src/asmjit/arm/a64rapass_p.h
@@ -37,7 +37,7 @@ public:
   //! \{
 
   ARMRAPass() noexcept;
-  virtual ~ARMRAPass() noexcept;
+  ~ARMRAPass() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/core/assembler.h b/src/asmjit/core/assembler.h
index fefd97e..aac72e0 100644
--- a/src/asmjit/core/assembler.h
+++ b/src/asmjit/core/assembler.h
@@ -45,7 +45,7 @@ public:
   //! Creates a new `BaseAssembler` instance.
   ASMJIT_API BaseAssembler() noexcept;
   //! Destroys the `BaseAssembler` instance.
-  ASMJIT_API virtual ~BaseAssembler() noexcept;
+  ASMJIT_API ~BaseAssembler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/core/builder.h b/src/asmjit/core/builder.h
index 2ff035b..e967d44 100644
--- a/src/asmjit/core/builder.h
+++ b/src/asmjit/core/builder.h
@@ -223,7 +223,7 @@ public:
   //! Creates a new `BaseBuilder` instance.
   ASMJIT_API BaseBuilder() noexcept;
   //! Destroys the `BaseBuilder` instance.
-  ASMJIT_API virtual ~BaseBuilder() noexcept;
+  ASMJIT_API ~BaseBuilder() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/core/compiler.h b/src/asmjit/core/compiler.h
index 6c32133..e0e15c9 100644
--- a/src/asmjit/core/compiler.h
+++ b/src/asmjit/core/compiler.h
@@ -77,7 +77,7 @@ public:
   //! Creates a new `BaseCompiler` instance.
   ASMJIT_API BaseCompiler() noexcept;
   //! Destroys the `BaseCompiler` instance.
-  ASMJIT_API virtual ~BaseCompiler() noexcept;
+  ASMJIT_API ~BaseCompiler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/core/jitruntime.h b/src/asmjit/core/jitruntime.h
index a8d0882..761d7e1 100644
--- a/src/asmjit/core/jitruntime.h
+++ b/src/asmjit/core/jitruntime.h
@@ -35,7 +35,7 @@ public:
   //! Creates a `JitRuntime` instance.
   ASMJIT_API explicit JitRuntime(const JitAllocator::CreateParams* params = nullptr) noexcept;
   //! Destroys the `JitRuntime` instance.
-  ASMJIT_API virtual ~JitRuntime() noexcept;
+  ASMJIT_API ~JitRuntime() noexcept override;
 
   ASMJIT_INLINE_NODEBUG void reset(ResetPolicy resetPolicy = ResetPolicy::kSoft) noexcept {
     _allocator.reset(resetPolicy);
diff --git a/src/asmjit/core/logger.h b/src/asmjit/core/logger.h
index b599d2c..0e28823 100644
--- a/src/asmjit/core/logger.h
+++ b/src/asmjit/core/logger.h
@@ -119,7 +119,7 @@ public:
   //! Creates a new `FileLogger` that logs to `FILE*`.
   ASMJIT_API FileLogger(FILE* file = nullptr) noexcept;
   //! Destroys the `FileLogger`.
-  ASMJIT_API virtual ~FileLogger() noexcept;
+  ASMJIT_API ~FileLogger() noexcept override;
 
   //! \}
 
@@ -155,7 +155,7 @@ public:
   //! Create new `StringLogger`.
   ASMJIT_API StringLogger() noexcept;
   //! Destroys the `StringLogger`.
-  ASMJIT_API virtual ~StringLogger() noexcept;
+  ASMJIT_API ~StringLogger() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/core/rapass_p.h b/src/asmjit/core/rapass_p.h
index 821d458..a96fdef 100644
--- a/src/asmjit/core/rapass_p.h
+++ b/src/asmjit/core/rapass_p.h
@@ -754,7 +754,7 @@ public:
   //! \{
 
   BaseRAPass() noexcept;
-  virtual ~BaseRAPass() noexcept;
+  ~BaseRAPass() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/x86/x86assembler.cpp b/src/asmjit/x86/x86assembler.cpp
index 1dd0096..2564e24 100644
--- a/src/asmjit/x86/x86assembler.cpp
+++ b/src/asmjit/x86/x86assembler.cpp
@@ -3017,6 +3017,7 @@ CaseExtRm:
         rmRel = &o0;
         goto EmitVexEvexM;
       }
+      break;
 
     case InstDB::kEncodingVexMri_Lx:
       opcode |= x86OpcodeLBySize(o0.x86RmSize() | o1.x86RmSize());
diff --git a/src/asmjit/x86/x86assembler.h b/src/asmjit/x86/x86assembler.h
index a533798..165ed12 100644
--- a/src/asmjit/x86/x86assembler.h
+++ b/src/asmjit/x86/x86assembler.h
@@ -642,7 +642,7 @@ public:
   //! \{
 
   ASMJIT_API explicit Assembler(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Assembler() noexcept;
+  ASMJIT_API ~Assembler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/x86/x86builder.h b/src/asmjit/x86/x86builder.h
index 4c56cba..0de36e9 100644
--- a/src/asmjit/x86/x86builder.h
+++ b/src/asmjit/x86/x86builder.h
@@ -326,7 +326,7 @@ public:
   //! \{
 
   ASMJIT_API explicit Builder(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Builder() noexcept;
+  ASMJIT_API ~Builder() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/x86/x86compiler.h b/src/asmjit/x86/x86compiler.h
index 26c43fa..add17b0 100644
--- a/src/asmjit/x86/x86compiler.h
+++ b/src/asmjit/x86/x86compiler.h
@@ -494,7 +494,7 @@ public:
   //! \{
 
   ASMJIT_API explicit Compiler(CodeHolder* code = nullptr) noexcept;
-  ASMJIT_API virtual ~Compiler() noexcept;
+  ASMJIT_API ~Compiler() noexcept override;
 
   //! \}
 
diff --git a/src/asmjit/x86/x86rapass_p.h b/src/asmjit/x86/x86rapass_p.h
index fe362a6..67227a1 100644
--- a/src/asmjit/x86/x86rapass_p.h
+++ b/src/asmjit/x86/x86rapass_p.h
@@ -36,7 +36,7 @@ public:
   //! \{
 
   X86RAPass() noexcept;
-  virtual ~X86RAPass() noexcept;
+  ~X86RAPass() noexcept override;
 
   //! \}