Subzero: Remove IceString.

src/IceIntrinsics.h

 //===- subzero/src/IceIntrinsics.h - List of Ice Intrinsics -----*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Declares the kinds of intrinsics supported by PNaCl.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICEINTRINSICS_H
 #define SUBZERO_SRC_ICEINTRINSICS_H
 
 #include "IceDefs.h"
+#include "IceStringPool.h"
 #include "IceTypes.h"
 
 namespace Ice {
 
 class InstCall;
 
 static constexpr size_t kMaxIntrinsicParameters = 6;
 
 class Intrinsics {
   Intrinsics(const Intrinsics &) = delete;
   Intrinsics &operator=(const Intrinsics &) = delete;
 
 public:
-  Intrinsics();
-  ~Intrinsics();
+  explicit Intrinsics(GlobalContext *Ctx);
+  ~Intrinsics() = default;
 
   /// Some intrinsics allow overloading by type. This enum collapses all
   /// overloads into a single ID, but the type can still be recovered by the
   /// type of the intrinsic function call's return value and parameters.
   enum IntrinsicID {
     UnknownIntrinsic = 0,
     // Arbitrary (alphabetical) order.
     AtomicCmpxchg,
     AtomicFence,
     AtomicFenceAll,
@@ skipping 109 matching lines @@
     Type getArgType(SizeT Index) const;
   };
 
   /// Find the information about a given intrinsic, based on function name. If
   /// the function name does not have the common "llvm." prefix, nullptr is
   /// returned and Error is set to false. Otherwise, tries to find a reference
   /// to a FullIntrinsicInfo entry (valid for the lifetime of the map). If
   /// found, sets Error to false and returns the reference. If not found, sets
   /// Error to true and returns nullptr (indicating an unknown "llvm.foo"
   /// intrinsic).
-  const FullIntrinsicInfo *find(const IceString &Name, bool &Error) const;
+  const FullIntrinsicInfo *find(GlobalString Name, bool &Error) const;
 
 private:
   // TODO(jvoung): May want to switch to something like LLVM's StringMap.
-  using IntrinsicMap = std::map<IceString, FullIntrinsicInfo>;
+  using IntrinsicMap = std::unordered_map<GlobalString, FullIntrinsicInfo>;
   IntrinsicMap Map;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEINTRINSICS_H