Merge branch 'master' of https://github.com/kripken/emscripten

2 files changed, 15 insertions, 3 deletions

diff --git a/src/library.js b/src/library.js
index a9476b73..faa86c68 100644
--- a/src/library.js
+++ b/src/library.js
@@ -5415,9 +5415,7 @@ LibraryManager.library = {
   },
 
   EMSCRIPTEN_COMMENT__inline: function(param) {
-    if (param.indexOf('CHECK_OVERFLOW') >= 0) {
-      param = param.split('(')[1].split(',')[0];
-    }
+    param = stripCorrections(param);
     return '// ' + Variables.globals[param].value.text.replace('\\00', '') + '   ';
   }
 };
diff --git a/src/parseTools.js b/src/parseTools.js
index f50092c7..2e7e1970 100644
--- a/src/parseTools.js
+++ b/src/parseTools.js
@@ -1382,3 +1382,17 @@ function finalizeBlockAddress(param) {
   return Functions.currFunctions[param.func].labelIds[param.label]; // XXX We rely on currFunctions here...?
 }
 
+function stripCorrections(param) {
+  var m;
+  if (m = /^\((.*)\)$/.exec(param)) {
+    param = m[1];
+  }
+  if (m = /^\((\w+)\)&\d+$/.exec(param)) {
+    param = m[1];
+  }
+  if (m = /CHECK_OVERFLOW\(([^,)]*),.*/.exec(param)) {
+    param = m[1];
+  }
+  return param;
+}
+