Subzero. X8664. No moar ::new for AutoBundle.

BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4360 BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=4077 R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1783893002 . Patch from John Porto <jpp@chromium.org>.

Subzero. X8664. No moar ::new for AutoBundle.
4abbb59c · John Porto · Jim Stichnoth · c10c1569 · 4abbb59c
Commit 4abbb59c authored Mar 10, 2016 by John Porto Committed by Jim Stichnoth Mar 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

IceTargetLoweringX86Base.h src/IceTargetLoweringX86Base.h +8 -3

No files found.
--- a/src/IceTargetLoweringX86Base.h
+++ b/src/IceTargetLoweringX86Base.h
@@ -461,7 +461,7 @@ protected:
    X86OperandMem **findMemoryReference() { return nullptr; }

  public:
-    std::unique_ptr<AutoBundle> Bundler;
+    AutoBundle *Bundler = nullptr;
    X86OperandMem **const MemOperand;

    template <typename... T>
@@ -471,13 +471,18 @@ protected:
                                         : findMemoryReference(Args...)) {
      if (MemOperand != nullptr) {
        if (Traits::Is64Bit) {
-          Bundler = makeUnique<AutoBundle>(Target, BundleLockOpt);
+          Bundler = new (Target->Func->template allocate<AutoBundle>())
+              AutoBundle(Target, BundleLockOpt);
        }
        *MemOperand = Target->_sandbox_mem_reference(*MemOperand);
      }
    }

-    ~AutoMemorySandboxer() {}
+    ~AutoMemorySandboxer() {
+      if (Bundler != nullptr) {
+        Bundler->~AutoBundle();
+      }
+    }
  };

  /// The following are helpers that insert lowered x86 instructions with