Increase souffle stack size when built with MSVC

Fix #2548

Author: quentin

.github/workflows/VS-CI-Tests.yml

@@ -69,13 +69,13 @@ jobs:
       working-directory: ${{github.workspace}}/build
       shell: cmd
       run: |
-        pushd "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" & call vcvars64.bat & popd
+        pushd "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" & call vcvars64.bat & popd
         ctest --output-on-failure --build-config Release --progress -j4 -L interpreted
 
     - name: Check others
       working-directory: ${{github.workspace}}/build
       shell: cmd
       run: |
-        pushd "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" & call vcvars64.bat & popd
+        pushd "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build" & call vcvars64.bat & popd
         ctest --output-on-failure --build-config Release --progress -j2 -LE interpreted
 

src/CMakeLists.txt

@@ -422,6 +422,20 @@ if (MSVC)
   target_compile_definitions(libsouffle PUBLIC USE_CUSTOM_GETOPTLONG)
   target_compile_definitions(compiled PUBLIC USE_CUSTOM_GETOPTLONG)
   target_compile_definitions(souffleprof PUBLIC USE_CUSTOM_GETOPTLONG)
+
+  # 16MB stack size
+  #
+  # When compiled in with Visual Studio with the default stack size of 1MB,
+  # the interpreter fails with a stack overflow in Engine::execute().
+  # The cause is the number of lambda functions that are allocated as locals on the stack.
+  # The stack frame of Engine::execute is close to 30KB.
+  # The 1MB stack will overflow at depth ~34 of Engine::execute().
+  #
+  # Tests such as inline_nqueens and magic_nqueens would fail without a large-enough
+  # stack size.
+  #
+  # See #2547.
+  target_link_options(souffle PUBLIC "/STACK:16777216")
 endif (MSVC)
 
 if (APPLE)

tests/evaluation/CMakeLists.txt

@@ -100,16 +100,9 @@ positive_test(magic_infbinding)
 positive_test(magic_lrg_attr_id)
 positive_test(magic_movies)
 positive_test(magic_names1)
-positive_test(magic_neglabel)
 positive_test(magic_negignored)
-if (NOT (MSVC AND (CMAKE_BUILD_TYPE MATCHES Debug)))
-  # When compiled in Debug with Visual Studio with the default stack size of 1MB,
-  # the interpreter fails with a stack overflow in Engine::execute().
-  # The cause is the number of lambda functions that are allocated as locals on the stack.
-  # The stack frame of Engine::execute is close to 30KB.
-  # The 1MB stack will overflow at depth ~34 of Engine::execute().
+positive_test(magic_neglabel)
 positive_test(magic_nqueens)
-endif ()
 positive_test(magic_perfect_numbers)
 positive_test(magic_posignored)
 positive_test(magic_poslabel)