Index: tools/llvm-xray/xray-account.h
===================================================================
--- tools/llvm-xray/xray-account.h
+++ tools/llvm-xray/xray-account.h
@@ -28,12 +28,11 @@
 class LatencyAccountant {
 public:
   typedef std::map<int32_t, std::vector<uint64_t>> FunctionLatencyMap;
-  typedef std::map<llvm::sys::procid_t, std::pair<uint64_t, uint64_t>>
+  typedef std::map<uint32_t, std::pair<uint64_t, uint64_t>>
       PerThreadMinMaxTSCMap;
   typedef std::map<uint8_t, std::pair<uint64_t, uint64_t>> PerCPUMinMaxTSCMap;
   typedef std::vector<std::pair<int32_t, uint64_t>> FunctionStack;
-  typedef std::map<llvm::sys::procid_t, FunctionStack>
-      PerThreadFunctionStackMap;
+  typedef std::map<uint32_t, FunctionStack> PerThreadFunctionStackMap;
 
 private:
   PerThreadFunctionStackMap PerThreadFunctionStack;
@@ -77,13 +76,6 @@
   ///
   bool accountRecord(const XRayRecord &Record);
 
-  const FunctionStack *getThreadFunctionStack(llvm::sys::procid_t TId) const {
-    auto I = PerThreadFunctionStack.find(TId);
-    if (I == PerThreadFunctionStack.end())
-      return nullptr;
-    return &I->second;
-  }
-
   const PerThreadFunctionStackMap &getPerThreadFunctionStack() const {
     return PerThreadFunctionStack;
   }
Index: tools/llvm-xray/xray-graph.h
===================================================================
--- tools/llvm-xray/xray-graph.h
+++ tools/llvm-xray/xray-graph.h
@@ -78,8 +78,7 @@
 
   using FunctionStack = SmallVector<FunctionAttr, 4>;
 
-  using PerThreadFunctionStackMap =
-      DenseMap<llvm::sys::procid_t, FunctionStack>;
+  using PerThreadFunctionStackMap = DenseMap<uint32_t, FunctionStack>;
 
   class GraphT : public Graph<FunctionStats, CallStats, int32_t> {
   public: