From 8b21cc589f0cc01344a6a772c97c1f24a40718cc Mon Sep 17 00:00:00 2001 From: Jim Stichnoth Date: Mon, 29 Aug 2016 10:15:18 -0700 Subject: [PATCH] Subzero: Fix the LLVM trunk build. The original Ice::Inst needed a bit of template specialization so that llvm::ilist methods wouldn't try to invoke private/deleted ctor/dtor methods. The Subzero code copied a pattern fairly widely used in LLVM. Recently, LLVM improved ilist<> so that this specialization is no longer needed. BUG= none R=jpp@chromium.org Review URL: https://codereview.chromium.org/2287363002 . --- src/IceInst.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/IceInst.h b/src/IceInst.h index 492df486c..c98f69d07 100644 --- a/src/IceInst.h +++ b/src/IceInst.h @@ -1122,6 +1122,7 @@ bool checkForRedundantAssign(const Variable *Dest, const Operand *Source); } // end of namespace Ice +#ifdef PNACL_LLVM namespace llvm { /// Override the default ilist traits so that Inst's private ctor and deleted @@ -1142,6 +1143,7 @@ private: }; } // end of namespace llvm +#endif // PNACL_LLVM namespace Ice { -- 2.11.0