diff --git a/emscripten-version.txt b/emscripten-version.txt
index 8b9623a5e153d..731351294780e 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.35.1
+1.35.2
 
diff --git a/tests/cases/breakinthemiddle2.ll b/tests/cases/breakinthemiddle2.ll
index aace0edbfed6b..58fc9e3d9695d 100644
--- a/tests/cases/breakinthemiddle2.ll
+++ b/tests/cases/breakinthemiddle2.ll
@@ -27,5 +27,4 @@ label999:                                     ; preds = %555
 }
 
 declare i32 @printf(i8*)
-declare i32 @__gxx_personality_v0(...)
 
diff --git a/tests/cases/i24_ce_fastcomp.ll b/tests/cases/i24_ce_fastcomp.ll
index 55d7f31d9a8f3..9ffdf1ffaa596 100644
--- a/tests/cases/i24_ce_fastcomp.ll
+++ b/tests/cases/i24_ce_fastcomp.ll
@@ -8222,7 +8222,7 @@ declare i32 @sysconf(i32) #5
 
 declare i32 @time(i32*) #5
 
-define weak i8* @_Znwj(i32 %size) #5 {
+define weak i8* @_Znwj(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %cmp = icmp eq i32 %size, 0
   %.size = select i1 %cmp, i32 1, i32 %size
@@ -8244,12 +8244,12 @@ if.then3:                                         ; preds = %while.body
           to label %invoke.cont unwind label %lpad.loopexit
 
 lpad.loopexit:                                    ; preds = %if.then3
-  %lpad.loopexit4 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %lpad.loopexit4 = landingpad { i8*, i32 }
           filter [1 x i8*] [i8* bitcast ({ i8*, i8*, i8* }* @_ZTISt9bad_alloc to i8*)]
   br label %lpad
 
 lpad.nonloopexit:                                 ; preds = %if.else
-  %lpad.nonloopexit5 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %lpad.nonloopexit5 = landingpad { i8*, i32 }
           filter [1 x i8*] [i8* bitcast ({ i8*, i8*, i8* }* @_ZTISt9bad_alloc to i8*)]
   br label %lpad
 
@@ -8298,13 +8298,13 @@ declare void @__cxa_throw(i8*, i8*, i8*)
 declare void @__cxa_call_unexpected(i8*)
 
 ; Function Attrs: nounwind
-define weak noalias i8* @_ZnwjRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 {
+define weak noalias i8* @_ZnwjRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %call = invoke noalias i8* @_Znwj(i32 %size)
           to label %try.cont unwind label %lpad
 
 lpad:                                             ; preds = %entry
-  %1 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %1 = landingpad { i8*, i32 }
           catch i8* null
   %2 = extractvalue { i8*, i32 } %1, 0
   %3 = tail call i8* @__cxa_begin_catch(i8* %2) #1
@@ -8316,7 +8316,7 @@ try.cont:                                         ; preds = %lpad, %entry
   ret i8* %p.0
 
 lpad1:                                            ; preds = %lpad
-  %4 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %4 = landingpad { i8*, i32 }
           filter [0 x i8*] zeroinitializer
   %5 = extractvalue { i8*, i32 } %4, 0
   tail call void @__cxa_call_unexpected(i8* %5) #6
@@ -8327,7 +8327,7 @@ declare i8* @__cxa_begin_catch(i8*)
 
 declare void @__cxa_end_catch()
 
-define weak noalias i8* @_Znaj(i32 %size) #5 {
+define weak noalias i8* @_Znaj(i32 %size) #5 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %call = invoke noalias i8* @_Znwj(i32 %size)
           to label %invoke.cont unwind label %lpad
@@ -8336,7 +8336,7 @@ invoke.cont:                                      ; preds = %entry
   ret i8* %call
 
 lpad:                                             ; preds = %entry
-  %0 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %0 = landingpad { i8*, i32 }
           filter [1 x i8*] [i8* bitcast ({ i8*, i8*, i8* }* @_ZTISt9bad_alloc to i8*)]
   %1 = extractvalue { i8*, i32 } %0, 1
   %ehspec.fails = icmp slt i32 %1, 0
@@ -8352,13 +8352,13 @@ eh.resume:                                        ; preds = %lpad
 }
 
 ; Function Attrs: nounwind
-define weak noalias i8* @_ZnajRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 {
+define weak noalias i8* @_ZnajRKSt9nothrow_t(i32 %size, %"struct.std::nothrow_t"*) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %call = invoke noalias i8* @_Znaj(i32 %size)
           to label %try.cont unwind label %lpad
 
 lpad:                                             ; preds = %entry
-  %1 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %1 = landingpad { i8*, i32 }
           catch i8* null
   %2 = extractvalue { i8*, i32 } %1, 0
   %3 = tail call i8* @__cxa_begin_catch(i8* %2) #1
@@ -8370,7 +8370,7 @@ try.cont:                                         ; preds = %lpad, %entry
   ret i8* %p.0
 
 lpad1:                                            ; preds = %lpad
-  %4 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %4 = landingpad { i8*, i32 }
           filter [0 x i8*] zeroinitializer
   %5 = extractvalue { i8*, i32 } %4, 0
   tail call void @__cxa_call_unexpected(i8* %5) #6
diff --git a/tests/cases/invoke_byval.ll b/tests/cases/invoke_byval.ll
index 7202bb654b623..a60d4f5f3aa87 100644
--- a/tests/cases/invoke_byval.ll
+++ b/tests/cases/invoke_byval.ll
@@ -8,7 +8,7 @@ target triple = "asmjs-unknown-emscripten"
 
 declare void @_Z4chak5point(%struct.point* byval align 1) #0
 
-define i32 @main(i32 %argc, i8** %argv) #0 {
+define i32 @main(i32 %argc, i8** %argv) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
   %1 = alloca i32, align 4
   %2 = alloca i32, align 4
   %3 = alloca i8**, align 4
@@ -64,7 +64,7 @@ define i32 @main(i32 %argc, i8** %argv) #0 {
   br label %44
 
 ; <label>:31                                      ; preds = %23, %0
-  %32 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %32 = landingpad { i8*, i32 }
           catch i8* bitcast ({ i8*, i8* }* @_ZTIi to i8*)
   %33 = extractvalue { i8*, i32 } %32, 0
   store i8* %33, i8** %5
diff --git a/tests/cases/invokebitcast.ll b/tests/cases/invokebitcast.ll
index bfbd9c88f6ac8..7218c317b1bbc 100644
--- a/tests/cases/invokebitcast.ll
+++ b/tests/cases/invokebitcast.ll
@@ -10,7 +10,7 @@ target triple = "asmjs-unknown-emscripten"
 @.str = private unnamed_addr constant [14 x i8] c"hello, world!\00", align 1 ; [#uses=1]
 
 ; [#uses=0]
-define i32 @main(i32 %p) {
+define i32 @main(i32 %p) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %retval = alloca i32                            ; [#uses=2]
   %0 = alloca i32                                 ; [#uses=2]
@@ -31,7 +31,7 @@ invcont33:
   ret i32 %retval1
 
 lpad106:
-  %Z = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %Z = landingpad { i8*, i32 }
        cleanup 
   ret i32 %retval1
 
diff --git a/tests/cases/invokeundef.ll b/tests/cases/invokeundef.ll
index a45832ed4ed85..e0a1386744946 100644
--- a/tests/cases/invokeundef.ll
+++ b/tests/cases/invokeundef.ll
@@ -10,7 +10,7 @@ target triple = "asmjs-unknown-emscripten"
 @.str = private unnamed_addr constant [14 x i8] c"hello, world!\00", align 1 ; [#uses=1]
 
 ; [#uses=0]
-define i32 @main() {
+define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %retval = alloca i32                            ; [#uses=2]
   %0 = alloca i32                                 ; [#uses=2]
@@ -31,7 +31,7 @@ invcont33:
   ret i32 %retval1
 
 lpad106:
-  %Z = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %Z = landingpad { i8*, i32 }
        cleanup
   ret i32 %retval1
 
diff --git a/tests/cases/legalizer_b_ta2.ll b/tests/cases/legalizer_b_ta2.ll
index dca067f3adffb..6b26bdedec77b 100644
--- a/tests/cases/legalizer_b_ta2.ll
+++ b/tests/cases/legalizer_b_ta2.ll
@@ -11,7 +11,7 @@ define i64 @retter(i64 %x) {
   ret i64 7017280452245743464
 }
 
-define i32 @main() {
+define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %buffer = alloca i8, i32 1000, align 4
   %bundled = bitcast i8* %buffer to i128*
@@ -165,7 +165,7 @@ a100:
   br label %done
 
 a111:
-  %aaaa79 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %aaaa79 = landingpad { i8*, i32 }
           cleanup
   br label %done
 
diff --git a/tests/cases/legalizer_ta2.ll b/tests/cases/legalizer_ta2.ll
index 954e0d6987a58..608d6373eedf6 100644
--- a/tests/cases/legalizer_ta2.ll
+++ b/tests/cases/legalizer_ta2.ll
@@ -11,7 +11,7 @@ define i64 @retter(i64 %x) {
   ret i64 7017280452245743464
 }
 
-define i32 @main() {
+define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %buffer = alloca i8, i32 1000, align 4
   %bundled = bitcast i8* %buffer to i104*
@@ -178,7 +178,7 @@ a100:
   br label %done
 
 a111:
-  %aaaa79 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %aaaa79 = landingpad { i8*, i32 }
           cleanup
   br label %done
 
diff --git a/tests/cases/longjmp_tiny_invoke.ll b/tests/cases/longjmp_tiny_invoke.ll
index 6936a548dc59c..0280bc7b31a08 100644
--- a/tests/cases/longjmp_tiny_invoke.ll
+++ b/tests/cases/longjmp_tiny_invoke.ll
@@ -6,7 +6,7 @@ target triple = "asmjs-unknown-emscripten"
 @.str = private unnamed_addr constant [13 x i8] c"hello world\0A\00", align 1
 @.str1 = private unnamed_addr constant [6 x i8] c"more\0A\00", align 1
 
-define i32 @main() {
+define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
   %retval = alloca i32, align 4
   store i32 0, i32* %retval
   %call = invoke i32 @setjmp(i16* getelementptr inbounds ([20 x i16], [20 x i16]* @_ZL3buf, i32 0, i32 0)) returns_twice
@@ -22,7 +22,7 @@ if.else:                                          ; preds = %entry
 if.end:                                           ; preds = %if.else, %if.then
   ret i32 0
 awful:
-  %Z = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %Z = landingpad { i8*, i32 }
        cleanup
   ret i32 1
 }
diff --git a/tests/cases/longjmp_tiny_invoke_phi.ll b/tests/cases/longjmp_tiny_invoke_phi.ll
index da9024745b6f6..2c2f9f376e04e 100644
--- a/tests/cases/longjmp_tiny_invoke_phi.ll
+++ b/tests/cases/longjmp_tiny_invoke_phi.ll
@@ -7,7 +7,7 @@ target triple = "asmjs-unknown-emscripten"
 @.str1 = private unnamed_addr constant [6 x i8] c"more\0A\00", align 1
 @.str2 = private unnamed_addr constant [6 x i8] c"fair\0A\00", align 1
 
-define i32 @main() {
+define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
 entry:
   %retval = alloca i32, align 4
   store i32 0, i32* %retval
@@ -35,7 +35,7 @@ if.end:                                           ; preds = %if.else, %if.then
   ret i32 0
 
 awful:
-  %Z = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %Z = landingpad { i8*, i32 }
        cleanup
   ret i32 1
 }
diff --git a/tests/cases/phiptrtoint.ll b/tests/cases/phiptrtoint.ll
index bb110c5ee865d..b156d4d915254 100644
--- a/tests/cases/phiptrtoint.ll
+++ b/tests/cases/phiptrtoint.ll
@@ -103,7 +103,7 @@ define internal i32 @_ZNK4test9Processor6resultEv(%"class.test::Processor"* noca
   ret i32 %2
 }
 
-define i32 @runProcess() {
+define i32 @runProcess() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
   %processor = alloca %"class.test::Processor", align 4
   call void @_ZN4test9ProcessorC1Ev(%"class.test::Processor"* %processor)
   %1 = invoke zeroext i1 @_ZN4test9Processor3runEv(%"class.test::Processor"* %processor)
@@ -118,7 +118,7 @@ define i32 @runProcess() {
   ret i32 %3
 
 ; <label>:5                                       ; preds = %2, %0
-  %6 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %6 = landingpad { i8*, i32 }
           cleanup
   invoke void @_ZN4test9ProcessorD1Ev(%"class.test::Processor"* %processor)
           to label %7 unwind label %8
@@ -127,7 +127,7 @@ define i32 @runProcess() {
   resume { i8*, i32 } %6
 
 ; <label>:8                                       ; preds = %5
-  %9 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
+  %9 = landingpad { i8*, i32 }
           catch i8* null
   call void @_ZSt9terminatev() noreturn nounwind
   unreachable
diff --git a/tests/core/stack_overflow.cpp b/tests/core/stack_overflow.cpp
index 67dba43e11a72..b30af38f94e32 100644
--- a/tests/core/stack_overflow.cpp
+++ b/tests/core/stack_overflow.cpp
@@ -1,25 +1,30 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <emscripten.h>
 
-void recurse(int x);
+void recurse(unsigned int x);
 
-void act(volatile int *a) {
+void act(volatile unsigned int *a) {
   printf("act     %d\n", *a);
-  int b = (int)(intptr_t)(alloca(*a));
+  unsigned int b = (int)(intptr_t)(alloca(*a));
   if (b < *a) *a--;
   recurse(*a);
 }
 
-void recurse(int x) {
+void recurse(volatile unsigned int x) {
   printf("recurse %d\n", x);
-  volatile int a = x;
+  volatile unsigned int a = x;
+  volatile char buffer[1000*1000];
+  buffer[x/2] = 0;
+  buffer[(x-1)/2] = 0;
+  EM_ASM({});
   if (x*x < x) {
     act(&a);
     if (a < x) x = a;
     x--;
-    return;
   }
+  x += buffer[x/2];
   if (x > 0) recurse(x-1);
 }
 
diff --git a/tests/test_other.py b/tests/test_other.py
index cee844fa59847..21ae0307b877f 100644
--- a/tests/test_other.py
+++ b/tests/test_other.py
@@ -4543,13 +4543,13 @@ def do_log_test(source, expected, func):
       assert expected == seen or (seen in expected if type(expected) in [list, tuple] else False), ['expect', expected, 'but see', seen]
 
     do_log_test(path_from_root('tests', 'primes.cpp'), range(88, 92), '_main')
-    do_log_test(path_from_root('tests', 'fannkuch.cpp'), range(227, 230), '__Z15fannkuch_workerPv')
+    do_log_test(path_from_root('tests', 'fannkuch.cpp'), range(226, 229), '__Z15fannkuch_workerPv')
 
     # test non-native as well, registerizeHarder can be a little more efficient here
     old_native = os.environ.get('EMCC_NATIVE_OPTIMIZER')
     try:
       os.environ['EMCC_NATIVE_OPTIMIZER'] = '0'
-      do_log_test(path_from_root('tests', 'fannkuch.cpp'), range(227, 230), '__Z15fannkuch_workerPv')
+      do_log_test(path_from_root('tests', 'fannkuch.cpp'), range(226, 229), '__Z15fannkuch_workerPv')
     finally:
       if old_native: os.environ['EMCC_NATIVE_OPTIMIZER'] = old_native
       else: del os.environ['EMCC_NATIVE_OPTIMIZER']
diff --git a/tools/shared.py b/tools/shared.py
index 817de1af83f56..76c2737f461c7 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -315,7 +315,7 @@ def fix_js_engine(old, new):
 
 # Expectations
 
-EXPECTED_LLVM_VERSION = (3, 7)
+EXPECTED_LLVM_VERSION = (3, 8)
 
 actual_clang_version = None