Subzero. RAII NaCl Bundling.

src/IceTargetLoweringX86Base.h

Index: src/IceTargetLoweringX86Base.h
diff --git a/src/IceTargetLoweringX86Base.h b/src/IceTargetLoweringX86Base.h
index 76e1445972a072168162bb20f95ed2b50c8f3c5c..4763f63fe95f476654020781a73e3b9635c419e7 100644
--- a/src/IceTargetLoweringX86Base.h
+++ b/src/IceTargetLoweringX86Base.h
@@ -382,6 +382,7 @@ protected:
     X86OperandMem **findMemoryReference() { return nullptr; }
 
   public:
+    std::unique_ptr<AutoBundle> Bundler;
     X86OperandMem **const MemOperand;
 
     template <typename... T>
@@ -392,16 +393,12 @@ protected:
                   ? 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