diff options
author | ngld <ngld@tproxy.de> | 2013-09-17 20:03:52 +0200 |
---|---|---|
committer | ngld <ngld@tproxy.de> | 2013-09-17 20:03:52 +0200 |
commit | 36a83c141e65d94c21592dc74e8461c4c31d16bd (patch) | |
tree | 341c7c0cd78f05b58d8817f02a58a5a8e38f9887 | |
parent | 147bc5e8b13ee6659b6a259a29400c53c537fb1c (diff) |
Fix #1623: Add missing checks for EXCEPTION_CATCHING_WHITELIST.
-rw-r--r-- | src/jsifier.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 1f53b1a2..fdde8dfb 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -1235,7 +1235,7 @@ function JSify(data, functionsOnly, givenFunctions) { return ret + ';'; }); makeFuncLineActor('resume', function(item) { - if (DISABLE_EXCEPTION_CATCHING) return 'abort()'; + if (DISABLE_EXCEPTION_CATCHING && !(item.funcData.ident in EXCEPTION_CATCHING_WHITELIST)) return 'abort()'; if (item.ident == 0) { // No exception to resume, so we can just bail. // This is related to issue #917 and http://llvm.org/PR15518 @@ -1311,7 +1311,7 @@ function JSify(data, functionsOnly, givenFunctions) { } }); makeFuncLineActor('landingpad', function(item) { - if (DISABLE_EXCEPTION_CATCHING && USE_TYPED_ARRAYS == 2) { + if (DISABLE_EXCEPTION_CATCHING && !(item.funcData.ident in EXCEPTION_CATCHING_WHITELIST) && USE_TYPED_ARRAYS == 2) { ret = makeVarDef(item.assignTo) + '$0 = 0; ' + item.assignTo + '$1 = 0;'; item.assignTo = null; if (VERBOSE) warnOnce('landingpad, but exceptions are disabled!'); |