Move functions from Impl onto TLI

Author: resistor

llvm/include/llvm/Analysis/TargetLibraryInfo.h

@@ -10,7 +10,9 @@
 #define LLVM_ANALYSIS_TARGETLIBRARYINFO_H
 
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/IR/Constants.h"
 #include "llvm/IR/InstrTypes.h"
+#include "llvm/IR/Module.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
 #include "llvm/TargetParser/Triple.h"
@@ -20,7 +22,6 @@
 namespace llvm {
 
 template <typename T> class ArrayRef;
-class ConstantInt;
 
 /// Provides info so a possible vectorization of a function can be
 /// computed. Function 'VectorFnName' is equivalent to 'ScalarFnName'
@@ -250,12 +251,6 @@ class TargetLibraryInfoImpl {
   /// Returns the size of the size_t type in bits.
   unsigned getSizeTSize(const Module &M) const;
 
-  /// Returns an IntegerType corresponding to size_t.
-  IntegerType *getSizeTType(const Module &M) const;
-
-  /// Returns a constant materialized as a size_t type.
-  ConstantInt *getAsSizeT(uint64_t V, const Module &M) const;
-
   /// Get size of a C-level int or unsigned int, in bits.
   unsigned getIntSize() const {
     return SizeOfInt;
@@ -572,14 +567,14 @@ class TargetLibraryInfo {
   /// \copydoc TargetLibraryInfoImpl::getSizeTSize()
   unsigned getSizeTSize(const Module &M) const { return Impl->getSizeTSize(M); }
 
-  /// \copydoc TargetLibraryInfoImpl::getSizeTType()
+  /// Returns an IntegerType corresponding to size_t.
   IntegerType *getSizeTType(const Module &M) const {
-    return Impl->getSizeTType(M);
+    return IntegerType::get(M.getContext(), getSizeTSize(M));
   }
 
-  /// \copydoc TargetLibraryInfoImpl::getAsSizeT()
+  /// Returns a constant materialized as a size_t type.
   ConstantInt *getAsSizeT(uint64_t V, const Module &M) const {
-    return Impl->getAsSizeT(V, M);
+    return ConstantInt::get(getSizeTType(M), V);
   }
 
   /// \copydoc TargetLibraryInfoImpl::getIntSize()

llvm/lib/Analysis/TargetLibraryInfo.cpp

@@ -1471,15 +1471,6 @@ unsigned TargetLibraryInfoImpl::getSizeTSize(const Module &M) const {
   return M.getDataLayout().getIndexSizeInBits(AddressSpace);
 }
 
-IntegerType *TargetLibraryInfoImpl::getSizeTType(const Module &M) const {
-  return IntegerType::get(M.getContext(), getSizeTSize(M));
-}
-
-ConstantInt *TargetLibraryInfoImpl::getAsSizeT(uint64_t V,
-                                               const Module &M) const {
-  return ConstantInt::get(getSizeTType(M), V);
-}
-
 TargetLibraryInfoWrapperPass::TargetLibraryInfoWrapperPass()
     : ImmutablePass(ID), TLA(TargetLibraryInfoImpl()) {
   initializeTargetLibraryInfoWrapperPassPass(*PassRegistry::getPassRegistry());