From 636a9b932284a518d44dbcbbf59a6ef4e7bca770 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Tue, 9 Oct 2018 05:17:46 +0200
Subject: [PATCH] - apply asmjit register allocator bugfix - enable debug
 builds of asmjit

---
 asmjit/CMakeLists.txt             | 2 +-
 asmjit/asmjit/x86/x86regalloc.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/asmjit/CMakeLists.txt b/asmjit/CMakeLists.txt
index ad832f9cc..ab5c2fb4f 100644
--- a/asmjit/CMakeLists.txt
+++ b/asmjit/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.7)
 
-make_release_only()
+#make_release_only()
 
 project(asmjit C)
 
diff --git a/asmjit/asmjit/x86/x86regalloc.cpp b/asmjit/asmjit/x86/x86regalloc.cpp
index f1883a73d..d0b3d58be 100644
--- a/asmjit/asmjit/x86/x86regalloc.cpp
+++ b/asmjit/asmjit/x86/x86regalloc.cpp
@@ -3341,7 +3341,7 @@ ASMJIT_INLINE void X86CallAlloc::alloc() {
         // allocation tasks by a single 'xchg' instruction, swapping
         // two registers required by the instruction/node or one register
         // required with another non-required.
-        if (C == X86Reg::kKindGp) {
+        if (C == X86Reg::kKindGp && sPhysId != Globals::kInvalidRegId) {
           _context->swapGp(aVReg, bVReg);
 
           aTied->flags |= TiedReg::kRDone;