From fa8b9eca28d42d844a67204b4160f2652d076fc8 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 24 Feb 2021 15:22:43 -0800 Subject: [PATCH] Fixed merged vreg forceMem --- IDEHelper/Backend/BeIRCodeGen.cpp | 1 - IDEHelper/Backend/BeMCContext.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IDEHelper/Backend/BeIRCodeGen.cpp b/IDEHelper/Backend/BeIRCodeGen.cpp index fb0c03cf..403dcc50 100644 --- a/IDEHelper/Backend/BeIRCodeGen.cpp +++ b/IDEHelper/Backend/BeIRCodeGen.cpp @@ -876,7 +876,6 @@ void BeIRCodeGen::Read(BeValue*& beValue) } } - Fail("ConstAgg struct member type mismatch"); } } diff --git a/IDEHelper/Backend/BeMCContext.cpp b/IDEHelper/Backend/BeMCContext.cpp index c8d3471e..d23f7295 100644 --- a/IDEHelper/Backend/BeMCContext.cpp +++ b/IDEHelper/Backend/BeMCContext.cpp @@ -8179,6 +8179,9 @@ void BeMCContext::DoInstCombinePass() _RemapEntry remapEntry = { remapPair.mKey, remapPair.mValue }; initRemaps.Add(remapEntry); } + + if (vregInfoFrom->mForceMem) + vregInfoTo->mForceMem = true; } auto _RemapVReg = [&](int& vregIdx) @@ -15839,7 +15842,7 @@ void BeMCContext::Generate(BeFunction* function) mDbgPreferredRegs[32] = X64Reg_R8;*/ //mDbgPreferredRegs[8] = X64Reg_RAX; - //mDebugging = (function->mName == "?Zoips@TestProgram@BeefTest@bf@@SAXXZ"); + //mDebugging = (function->mName == "?ParseRegex@Program@Regex@bf@@CAPEAV?$List@?AUStringView@System@bf@@@Collections@System@3@UStringView@63@0@Z"); // || (function->mName == "?MethodA@TestProgram@BeefTest@bf@@CAXXZ"); // || (function->mName == "?Hey@Blurg@bf@@SAXXZ") // ;