debug info cleanup

3 files changed, 14 insertions, 13 deletions

diff --git a/src/compiler.js b/src/compiler.js
index ea55d95e..d2d14d9b 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -153,9 +153,11 @@ if (FAKE_X86_FP80) {
 var lines = raw.split('\n');
 raw = null;
 
-// Do it
+// Parse metadata
+
+Debugging.handleMetadata(lines);
 
-//dprint(JSON.stringify(C_DEFINES));
+// Do it
 
 var intertyped = intertyper(lines);
 lines = null;
diff --git a/src/intertyper.js b/src/intertyper.js
index 86da2a1f..834345bf 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -21,14 +21,6 @@ function intertyper(data, sidePass, baseLineNum) {
       LLVM_STYLE = (data.indexOf('<label>') == -1 && data.indexOf('entry:') != -1) ? 'old' : 'new';
       //dprint('LLVM_STYLE: ' + LLVM_STYLE);
     }
-
-    // If the source contains debug info as LLVM metadata, process that out (and save the debugging info for later)
-    for (var i = data.length-1; i >= 0; i--) {
-      if (/^!\d+ = metadata .*/.exec(data[i])) {
-        Debugging.processMetadata(data);
-        break;
-      }
-    }
   }
 
   // Substrate
diff --git a/src/modules.js b/src/modules.js
index db43a4e7..411bc66f 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -21,6 +21,15 @@ var LLVM = {
 LLVM.GLOBAL_MODIFIERS = set(keys(LLVM.LINKAGES).concat(['constant', 'global', 'hidden']));
 
 var Debugging = {
+  handleMetadata: function(lines) {
+    for (var i = lines.length-1; i >= 0; i--) {
+      if (/^!\d+ = metadata .*/.exec(lines[i])) {
+        Debugging.processMetadata(lines);
+        break;
+      }
+    }
+  },
+
   processMetadata: function(lines) {
     var llvmLineToMetadata = {};
     var metadataToSourceLine = {};
@@ -49,11 +58,9 @@ var Debugging = {
     var formStructMembers = /^!(\d+) = metadata !\{(.*)\}$/;
     var formMember = /^!(\d+) = metadata !\{i32 \d+, metadata !\d+, metadata !"([^"]+)", metadata !\d+, (?:i32 \d+|null), i64 \d+, i64 \d+, i64 \d+, .+?, metadata !(\d+)}.*$/;
 
-    var debugComment = new RegExp(/; +\[debug line = \d+:\d+\]/);
-
     for (var i = 0; i < lines.length; i++) {
       var line = lines[i];
-      line = line.replace(debugComment, '');
+      line = line.replace(/; +\[debug line = \d+:\d+\]/, '');
       var skipLine = false;
 
       if (form6.exec(line)) {