Fixes case where terminator instruction is missing at end of function.

pydir/run-pnacl-sz.py

 #!/usr/bin/env python2
 
 import argparse
 import itertools
 import os
 import re
 import subprocess
 import sys
 import tempfile
 
@@ skipping 60 matching lines @@
                            help='Add a disassembler flag')
     argparser.add_argument('--filetype', default='iasm', dest='filetype',
                            choices=['obj', 'asm', 'iasm'],
                            help='Output file type.  Default %(default)s.')
     argparser.add_argument('--target', default='x8632', dest='target',
                            choices=['x8632','arm32'],
                            help='Target architecture.  Default %(default)s.')
     argparser.add_argument('--echo-cmd', required=False,
                            action='store_true',
                            help='Trace command that generates ICE instructions')
+    argparser.add_argument('--tbc', required=False, action='store_true',
+                           help='Input is textual bitcode (not .ll)')
+    argparser.add_argument('--fail', required=False, action='store_true',

[Jim Stichnoth, 2015/06/29 22:43:12]

Bikeshedding: how about something like '--expect-fail'?

[Karl, 2015/06/30 18:46:09]

Done.

+                           help='Negate success of run by using LLVM not')
     argparser.add_argument('--args', '-a', nargs=argparse.REMAINDER,
                            default=[],
                            help='Remaining arguments are passed to pnacl-sz')
 
     args = argparser.parse_args()
     pnacl_bin_path = args.pnacl_bin_path
     llfile = args.input
 
     if args.llvm and args.llvm_source:
       raise RuntimeError("Can't specify both '--llvm' and '--llvm-source'")
 
     if args.llvm_source and args.no_local_syms:
       raise RuntimeError("Can't specify both '--llvm-source' and " +
                          "'--no-local-syms'")
 
+    if args.llvm_source and args.tbc:
+      raise RuntimeError("Can't specify '--tbc' and '--llvm-source'")

[Jim Stichnoth, 2015/06/29 22:43:12]

"Can't specify both ..." for consistency?

[Karl, 2015/06/30 18:46:09]

Done.

+
+    if args.llvm and args.tbc:
+      raise RuntimeError("Can't specify '--tbc' and '--llvm'")
+
     cmd = []
-    if not args.llvm_source:
+    if args.tbc:
+      cmd = [os.path.join(pnacl_bin_path, 'pnacl-bcfuzz'), llfile,
+             '-bitcode-as-text', '-output', '-', '|']
+    elif not args.llvm_source:
       cmd = [os.path.join(pnacl_bin_path, 'llvm-as'), llfile, '-o', '-', '|',
              os.path.join(pnacl_bin_path, 'pnacl-freeze')]
       if not args.no_local_syms:
         cmd += ['--allow-local-symbol-tables']
       cmd += ['|']
+    if args.fail:
+      cmd += [os.path.join(pnacl_bin_path, 'not')]
     cmd += [args.pnacl_sz]
     cmd += ['--target', args.target]
     if args.insts:
       # If the tests are based on '-verbose inst' output, force
       # single-threaded translation because dump output does not get
       # reassembled into order.
       cmd += ['-verbose', 'inst', '-notranslate', '-threads=0']
     if not args.llvm_source:
       cmd += ['--bitcode-format=pnacl']
       if not args.no_local_syms:
@@ skipping 27 matching lines @@
               [asm_temp.name])
 
     stdout_result = shellcmd(cmd, echo=args.echo_cmd)
     if not args.echo_cmd:
       sys.stdout.write(stdout_result)
     if asm_temp:
       os.remove(asm_temp.name)
 
 if __name__ == '__main__':
     main()