handle |byval align X|

emscripten-core · May 10, 2011 · 123385f · 123385f
1 parent 9e272a8
commit 123385f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/modules.js b/src/modules.js
@@ -6,7 +6,7 @@ var LLVM = {
   LINKAGES: set('private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto', 'internal',
                 'available_externally', 'linkonce', 'common', 'weak', 'appending', 'extern_weak', 'linkonce_odr',
                 'weak_odr', 'externally_visible', 'dllimport', 'dllexport', 'unnamed_addr'),
-  PARAM_ATTR: set('noalias', 'signext', 'zeroext', 'inreg', 'byval', 'sret', 'nocapture', 'nest'),
+  PARAM_ATTR: set('noalias', 'signext', 'zeroext', 'inreg', 'sret', 'nocapture', 'nest'),
   CALLING_CONVENTIONS: set('ccc', 'fastcc', 'coldcc', 'cc10')
 };
 LLVM.GLOBAL_MODIFIERS = set(keys(LLVM.LINKAGES).concat(['constant', 'global', 'hidden']));

diff --git a/src/parseTools.js b/src/parseTools.js
@@ -266,6 +266,13 @@ function parseParamTokens(params) {
     var segment = params.slice(0, i);
     params = params.slice(i+1);
     segment = cleanSegment(segment);
+    if (segment[1] && segment[1].text === 'byval') {
+      // handle 'byval' and 'byval align X'
+      segment.splice(1, 1);
+      if (segment[1] && segment[1].text === 'align') {
+        segment.splice(1, 2);
+      }
+    }
     if (segment.length == 1) {
       if (segment[0].text == '...') {
         ret.push({