receive MAX_SETJMPS from emscripten; 1.18.4

Author: kripken

emscripten-version.txt

@@ -1,2 +1,2 @@
-1.18.3
+1.18.4
 

lib/Target/JSBackend/CallHandlers.h

@@ -162,7 +162,7 @@ DEF_CALL_HANDLER(emscripten_resume, {
 // setjmp support
 
 DEF_CALL_HANDLER(emscripten_prep_setjmp, {
-  return getAdHocAssign("_setjmpTable", Type::getInt32Ty(CI->getContext())) + "STACKTOP; STACKTOP=(STACKTOP+168)|0;" + // XXX FIXME
+  return getAdHocAssign("_setjmpTable", Type::getInt32Ty(CI->getContext())) + "STACKTOP; STACKTOP=(STACKTOP+" + utostr(4 * 2 * (MaxSetjmps+1)) + ")|0;" +
          "HEAP32[_setjmpTable>>2]=0";
 })
 DEF_CALL_HANDLER(emscripten_setjmp, {

lib/Target/JSBackend/JSBackend.cpp

@@ -88,6 +88,11 @@ NoAliasingFunctionPointers("emscripten-no-aliasing-function-pointers",
                            cl::desc("Forces function pointers to not alias (this is more correct, but rarely needed, and has the cost of much larger function tables; it is useful for debugging though; see emscripten ALIASING_FUNCTION_POINTERS option)"),
                            cl::init(false));
 
+static cl::opt<int>
+MaxSetjmps("emscripten-max-setjmps",
+           cl::desc("Maximum amount of setjmp() calls per function stack frame (see emscripten MAX_SETJMPS)"),
+           cl::init(20));
+
 extern "C" void LLVMInitializeJSBackendTarget() {
   // Register the target.
   RegisterTargetMachine<JSTargetMachine> X(TheJSBackendTarget);