Subzero: Fix the LLVM trunk build.

src/IceInst.h

 //===- subzero/src/IceInst.h - High-level instructions ----------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 1104 matching lines @@
       : Inst(Func, Kind, MaxSrcs, Dest) {
     assert(Kind >= Target);
     assert(Kind <= Target_Max);
   }
 };
 
 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
 /// dtor aren't invoked.
 template <>
 struct ilist_traits<Ice::Inst> : public ilist_default_traits<Ice::Inst> {
   Ice::Inst *createSentinel() const {
     return static_cast<Ice::Inst *>(&Sentinel);
   }
   static void destroySentinel(Ice::Inst *) {}
   Ice::Inst *provideInitialHead() const { return createSentinel(); }
   Ice::Inst *ensureHead(Ice::Inst *) const { return createSentinel(); }
   static void noteHead(Ice::Inst *, Ice::Inst *) {}
   void deleteNode(Ice::Inst *) {}
 
 private:
   mutable ilist_half_node<Ice::Inst> Sentinel;
 };
 
 } // end of namespace llvm
+#endif // PNACL_LLVM
 
 namespace Ice {
 
 inline InstList::iterator instToIterator(Inst *Instr) {
 #ifdef PNACL_LLVM
   return Instr;
 #else  // !PNACL_LLVM
   return Instr->getIterator();
 #endif // !PNACL_LLVM
 }
 
 inline Inst *iteratorToInst(InstList::iterator Iter) { return &*Iter; }
 
 inline const Inst *iteratorToInst(InstList::const_iterator Iter) {
   return &*Iter;
 }
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEINST_H