Subzero. RAII NaCl Bundling.

src/IceTargetLoweringX86Base.h

 //===- subzero/src/IceTargetLoweringX86Base.h - x86 lowering ----*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 364 matching lines @@
     X86OperandMem **findMemoryReference(T **First, Tail... Others) {
       if (llvm::isa<X86OperandMem>(*First)) {
         return reinterpret_cast<X86OperandMem **>(First);
       }
       return findMemoryReference(Others...);
     }
 
     X86OperandMem **findMemoryReference() { return nullptr; }
 
   public:
+    std::unique_ptr<AutoBundle> Bundler;
     X86OperandMem **const MemOperand;
 
     template <typename... T>
     AutoMemorySandboxer(typename Traits::TargetLowering *Target, T... Args)
         : Target(Target),
           MemOperand(
               (!Traits::Is64Bit || !Target->Ctx->getFlags().getUseSandboxing())
                   ? nullptr
                   : findMemoryReference(Args...)) {
       if (MemOperand != nullptr) {
-        Target->_bundle_lock(BundleLockOpt);
+        Bundler = makeUnique<AutoBundle>(Target, BundleLockOpt);
         *MemOperand = Target->_sandbox_mem_reference(*MemOperand);
       }
     }
 
-    ~AutoMemorySandboxer() {
-      if (MemOperand != nullptr) {
-        Target->_bundle_unlock();
-      }
-    }
+    ~AutoMemorySandboxer() {}
   };
 
   /// The following are helpers that insert lowered x86 instructions with
   /// minimal syntactic overhead, so that the lowering code can look as close to
   /// assembly as practical.
   void _adc(Variable *Dest, Operand *Src0) {
     AutoMemorySandboxer<> _(this, &Dest, &Src0);
     Context.insert<typename Traits::Insts::Adc>(Dest, Src0);
   }
   void _adc_rmw(X86OperandMem *DestSrc0, Operand *Src1) {
@@ skipping 584 matching lines @@
 
   static FixupKind PcRelFixup;
   static FixupKind AbsFixup;
 };
 } // end of namespace X86NAMESPACE
 } // end of namespace Ice
 
 #include "IceTargetLoweringX86BaseImpl.h"
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX86BASE_H