Implemented linking to a dummy ASan runtime

pydir/szbuild.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import pipes
 import re
 import sys
 
 from utils import FindBaseNaCl, GetObjcopyCmd, get_sfi_string, shellcmd
 
@@ skipping 85 matching lines @@
                            help='Generate code for specified target.')
     argparser.add_argument('--verbose', '-v', dest='verbose',
                            action='store_true',
                            help='Display some extra debugging output')
     argparser.add_argument('--sz', dest='sz_args', action='append', default=[],
                            help='Extra arguments for Subzero')
     argparser.add_argument('--llc', dest='llc_args', action='append',
                            default=[], help='Extra arguments for llc')
     argparser.add_argument('--no-sz', dest='nosz', action='store_true',
                            help='Run only post-Subzero build steps')
+    argparser.add_argument('--fsanitize-address', dest='asan',
+                           action='store_true',
+                           help='Instrument with AddressSanitizer')
 
 def LinkSandbox(objs, exe, target, verbose=True):
     assert target in ('x8632', 'x8664', 'arm32'), \
         '-sandbox is not available for %s' % target
     nacl_root = FindBaseNaCl()
     gold = ('{root}/toolchain/linux_x86/pnacl_newlib_raw/bin/' +
             'le32-nacl-ld.gold').format(root=nacl_root)
     target_lib_dir = {
       'arm32': 'arm',
       'x8632': 'x86-32',
@@ skipping 140 matching lines @@
       --install=toolchain/linux_x86/pnacl_newlib_raw
     """
     argparser = argparse.ArgumentParser(
         description='    ' + main.__doc__,
         formatter_class=argparse.RawTextHelpFormatter)
     AddOptionalArgs(argparser)
     argparser.add_argument('pexe', help='Finalized pexe to translate')
     args = argparser.parse_args()
     pexe = args.pexe
     exe = args.output
+    if args.asan:
+        if args.sandbox or args.nonsfi:
+            print 'Can only use AddressSanitizer with a native build'
+            exit()
+        if not '-fsanitize-address' in args.sz_args:
+            args.sz_args.append('-fsanitize-address')

[Jim Stichnoth, 2016/06/15 05:21:16]

I think you still want to append -fsanitize-address (just not bother to try to
de-dupe).

[tlively, 2016/06/15 16:32:00]

Done.

     ProcessPexe(args, pexe, exe)
 
 def ProcessPexe(args, pexe, exe):
     [pexe_base, ext] = os.path.splitext(pexe)
     if ext != '.pexe':
         pexe_base = pexe
     pexe_base_unescaped = pexe_base
     pexe_base = pipes.quote(pexe_base)
     pexe = pipes.quote(pexe)
 
@@ skipping 163 matching lines @@
                      start=get_sfi_string(args, '_start', '_start',
                                           '_user_start')),
                  echo=args.verbose)
 
     # Run the linker regardless of hybrid mode.
     if args.sandbox:
         LinkSandbox([obj_partial], exe, args.target, args.verbose)
     elif args.nonsfi:
         LinkNonsfi([obj_partial], exe, args.target, args.verbose)
     else:
-        LinkNative([obj_partial], exe, args.target, args.verbose)
+        objs = [obj_partial]
+        if args.asan:
+            objs.append(
+                ('{root}/toolchain_build/src/subzero/build/runtime/' +
+                 'szrt_asan_{target}.o').format(root=nacl_root,
+                                                target=args.target))
+        LinkNative(objs, exe, args.target, args.verbose)
 
     # Put the extra verbose printing at the end.
     if args.verbose and hybrid:
         print 'include={regex}'.format(regex=re_include_str)
         print 'exclude={regex}'.format(regex=re_exclude_str)
         print 'default_match={dm}'.format(dm=default_match)
         print 'Number of Subzero syms = {num}'.format(num=len(sz_syms))
 
 if __name__ == '__main__':
     main()