nicer output in emcc when there are source code errors, plus test

2 files changed, 19 insertions, 2 deletions

diff --git a/emcc b/emcc
index 3e666bb3..e29946cf 100755
--- a/emcc
+++ b/emcc
@@ -363,9 +363,13 @@ try:
   # First, generate LLVM bitcode. For each input file, we get base.o with bitcode
   for input_file in input_files:
     if input_file.endswith(SOURCE_SUFFIXES):
-      args = newargs + ['-emit-llvm', '-c', input_file, '-o', in_temp(unsuffixed_basename(input_file) + '.o')]
+      output_file = in_temp(unsuffixed_basename(input_file) + '.o')
+      args = newargs + ['-emit-llvm', '-c', input_file, '-o', output_file]
       if DEBUG: print >> sys.stderr, "emcc running:", call, ' '.join(args)
-      Popen([call] + args).communicate()
+      Popen([call] + args).communicate() # let compiler frontend print directly, so colors are saved (PIPE kills that)
+      if not os.path.exists(output_file):
+        print >> sys.stderr, 'emcc: compiler frontend failed to generate LLVM bitcode, halting'
+        sys.exit(1)
     else: # bitcode
       if input_file.endswith(('.bc', '.o')):
         shutil.copyfile(input_file, in_temp(unsuffixed_basename(input_file) + '.o'))
diff --git a/tests/runner.py b/tests/runner.py
index 3806d8ea..a2073af1 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -4925,6 +4925,19 @@ Options that are modified or new in %s include:
         assert os.path.exists('a.out.js'), '\n'.join(output)
         self.assertContained('hello, world!', run_js('a.out.js'))
 
+        # properly report source code errors, and stop there
+        clear()
+        assert not os.path.exists('a.out.js')
+        output = Popen([compiler, path_from_root('tests', 'hello_world_error' + suffix)], stdout=PIPE, stderr=PIPE).communicate()
+        assert not os.path.exists('a.out.js'), 'compilation failed, so no output file is expected'
+        assert len(output[0]) == 0, output[0]
+        self.assertNotContained('IOError', output[1]) # no python stack
+        self.assertNotContained('Traceback', output[1]) # no python stack
+        self.assertContained('error: invalid preprocessing directive', output[1])
+        self.assertContained('''error: use of undeclared identifier 'cheez''', output[1])
+        self.assertContained('2 errors generated', output[1])
+        assert output[1].split('2 errors generated.')[1].replace('\n', '') == 'emcc: compiler frontend failed to generate LLVM bitcode, halting'
+
         # emcc src.cpp -c    and   emcc src.cpp -o src.[o|bc] ==> should give a .bc file
         for args in [['-c'], ['-o', 'src.o'], ['-o', 'src.bc']]:
           target = args[1] if len(args) == 2 else 'hello_world.o'