Update pnacl/DEPS to bring in stricter ABI checks for metadata

pnacl/driver/pnacl-ld.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # IMPORTANT NOTE: If you make local mods to this file, you must run:
 #   %  pnacl/build.sh driver
 # in order for them to take effect in the scons build.  This command
 # updates the copy in the toolchain/ tree.
 #
@@ skipping 319 matching lines @@
     bitcode_type = 'pexe'
     native_type = 'nexe'
 
   if native_objects and not allow_native:
     argstr = ' '.join(native_objects)
     Log.Fatal("Native objects '%s' detected in the link. "
               "To allow, specify --pnacl-allow-native" % argstr)
 
   tng = TempNameGen([], output)
 
+  has_bitcode = HasBitcodeInputs(inputs)
   # Do the bitcode link.
-  if HasBitcodeInputs(inputs):
+  if has_bitcode:
     chain = DriverChain(inputs, output, tng)
     chain.add(LinkBC, 'pre_opt.' + bitcode_type)
 
     # ABI simplification passes.  These passes assume the whole
     # program is available and should not be used if we are linking .o
     # files, otherwise:
     #  * -expand-varargs will mix calling conventions;
     #  * -nacl-expand-ctors will drop constructors;
     #  * -nacl-expand-tls leave TLS variables unconverted.
     if env.getbool('STATIC') and len(native_objects) == 0:
@@ skipping 18 matching lines @@
       chain.add(DoLTO, 'opt.' + bitcode_type)
     elif env.getone('STRIP_MODE') != 'none':
       chain.add(DoStrip, 'stripped.' + bitcode_type)
 
     if env.getbool('STATIC'):
       # ABI simplification passes.  We should not place arbitrary
       # passes after '-expand-constant-expr' because they might
       # reintroduce ConstantExprs.  However, '-expand-getelementptr'
       # must follow '-expand-constant-expr' to expand the
       # getelementptr instructions it creates.
-      passes = ['-expand-constant-expr',
+      # We place '-strip-metadata' after optimization passes are run
+      # since optimizations depend on the metadata.
+      passes = ['-strip-metadata',
+                '-expand-constant-expr',
                 '-expand-getelementptr']
-      if (not env.getbool('DISABLE_ABI_CHECK') and
-          not env.getbool('ALLOW_CXX_EXCEPTIONS') and
-          len(native_objects) == 0):
-        passes += ['-verify-pnaclabi-module',
-                   '-verify-pnaclabi-functions']
       chain.add(DoLLVMPasses(passes),
                 'expand_features_after_opt.' + bitcode_type)
   else:
     chain = DriverChain('', output, tng)
 
   # If -arch is also specified, invoke pnacl-translate afterwards.
   if arch_flag_given:
     env.set('NATIVE_OBJECTS', *native_objects)
     chain.add(DoTranslate, native_type)
 
   chain.run()
 
+  if (has_bitcode and
+      env.getbool('STATIC') and
+      not env.getbool('DISABLE_ABI_CHECK') and
+      not env.getbool('ALLOW_CXX_EXCEPTIONS') and
+      len(native_objects) == 0):
+    RunDriver('abicheck', [output, '-allow-debug-metadata'])

[Mark Seaborn, 2013/04/25 18:03:35]

Why a separate invocation?  This will be slower.  It does make it easier to
debug when the ABI verifier rejects the code, but maybe we should handle that
sort of debugging via something like -save-temps?

[jvoung (off chromium), 2013/04/26 21:24:49]

Merged the check back into the other run of opt.

+
   if bitcode_type == 'pexe' and not arch_flag_given:
     # Mark .pexe files as executable.
     # Some versions of 'configure' expect this.
     SetExecutableMode(output)
   return 0
 
 def RemoveNativeStdLibs(objs):
   # For newlib, all standard libraries are already bitcode.
   if env.getbool('LIBMODE_NEWLIB'):
     return objs
@@ skipping 124 matching lines @@
   -O<opt-level>               Optimize output file
   -M, --print-map             Print map file on standard output
   --whole-archive             Include all objects from following archives
   --no-whole-archive          Turn off --whole-archive
   -s, --strip-all             Strip all symbols
   -S, --strip-debug           Strip debugging symbols
   --undefined SYMBOL          Start with undefined reference to SYMBOL
 
   -help | -h                  Output this help.
 """