From c0b4721736b2353e5522aab694696b0d83b6bbcc Mon Sep 17 00:00:00 2001 From: meg-gupta Date: Thu, 18 Jan 2018 03:03:48 -0800 Subject: [PATCH] deps: update ChakraCore to Microsoft/ChakraCore@99131a0f2c [1.8>1.9] [MERGE #4567 @meg-gupta] Loosen Globopt assert when called from HoistInvariantValueInfo Merge pull request #4567 from meg-gupta:lossenGlobOptAssert Fixes OS#15189393 Example: ``` invariantSym = ..[]; // non object value type landingPad : loopTop : = LdElem[invariantSym + ...] // non-object value type in first pass, object value type in second pass = LdFld[invariantSym...] // object value type loopEnd ``` invariantSym is invariant in this loop, for some reason if we fail to hoist the LdFld, then assert saying valueInfos are incompatible will fire, when we try to hoist the LdElem. Because optimization of LdFld will force combine the valuetype of invariantSym with Object, and in the second pass while optimizing LdElem in HoistInvariantValueInfo, we will call ChangeValueInfo and this assert will fire. This is because we are trying to change a non-object valuetype to an object valuetype. AreValueTypesCompatible function converts to definite valuetypes before checking if they are compatible. The check doesn't care if both of them are likely. Globopt calls ChangeValueInfo with allowIncompatiblyTypes set to false in most cases where we are transforming specific to generic/generic to specific like Typespecialization etc. It calls ChangeValueInfo with allowIncompatiblyTypes set to true, where we can expect incompatible types ex: UpdateObjPtrValueInfo. This fix calls ChangeValueInfo from HoistInvariantValueInfo with allowIncompatiblyTypes set to true. Reviewed-By: chakrabot --- deps/chakrashim/core/lib/Backend/GlobOpt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/chakrashim/core/lib/Backend/GlobOpt.cpp b/deps/chakrashim/core/lib/Backend/GlobOpt.cpp index 8aa33affd2d..6c708e825ea 100644 --- a/deps/chakrashim/core/lib/Backend/GlobOpt.cpp +++ b/deps/chakrashim/core/lib/Backend/GlobOpt.cpp @@ -17177,7 +17177,7 @@ GlobOpt::HoistInvariantValueInfo( newValueInfo = invariantValueInfoToHoist->Copy(alloc); this->SetSymStoreDirect(newValueInfo, symStore); } - ChangeValueInfo(targetBlock, valueToUpdate, newValueInfo); + ChangeValueInfo(targetBlock, valueToUpdate, newValueInfo, true); } // static