Circumvent MSVC possible bug causing a crash in optimized builds

2 files changed, 3 insertions, 4 deletions

diff --git a/Lanes.vcxproj b/Lanes.vcxproj
index 1575789..b709f92 100644
--- a/Lanes.vcxproj
+++ b/Lanes.vcxproj
@@ -745,7 +745,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\
       </Command>
     </PreBuildEvent>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
@@ -785,7 +784,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513
       </Command>
     </PreBuildEvent>
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1025,7 +1023,6 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua513
       </Command>
     </PreBuildEvent>
     <ClCompile>
-      <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/src/universe.cpp b/src/universe.cpp
index db00b72..89ad02a 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -451,7 +451,9 @@ int Universe::UniverseGC(lua_State* const L_)
         } else {
             // take the value returned by the finalizer (or our default message) and throw it as an error
             // since we are inside Lua's GCTM, it will be propagated through the warning system (Lua 5.4) or swallowed silently
-            raise_lua_error(L_);
+            // IMPORTANT: lua_error() is used here instead of the wrapper raise_lua_error() to circumvent what looks like a MSVC compiler bug
+            // that manifests as a crash inside ntdll!longjmp() function, in optimized builds only
+            lua_error(L_);
         }
     }