GlobalISel: cache pointer sizes in LLT

Otherwise everything that needs to work out what size they are has to keep a
DataLayout handy, which is a bit silly and very annoying.

llvm-svn: 281597

2 files changed, 5 insertions, 5 deletions

diff --git a/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp b/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
index 66c2ef349e7..e45d718c2b0 100644
--- a/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
+++ b/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
@@ -232,9 +232,9 @@ bool AArch64InstructionSelector::select(MachineInstr &I) const {
 
   case TargetOpcode::G_FRAME_INDEX: {
     // allocas and G_FRAME_INDEX are only supported in addrspace(0).
-    if (Ty != LLT::pointer(0)) {
+    if (Ty != LLT::pointer(0, 64)) {
       DEBUG(dbgs() << "G_FRAME_INDEX pointer has type: " << Ty
-                   << ", expected: " << LLT::pointer(0) << '\n');
+            << ", expected: " << LLT::pointer(0, 64) << '\n');
       return false;
     }
 
@@ -251,9 +251,9 @@ bool AArch64InstructionSelector::select(MachineInstr &I) const {
     LLT MemTy = Ty;
     LLT PtrTy = MRI.getType(I.getOperand(1).getReg());
 
-    if (PtrTy != LLT::pointer(0)) {
+    if (PtrTy != LLT::pointer(0, 64)) {
       DEBUG(dbgs() << "Load/Store pointer has type: " << PtrTy
-                   << ", expected: " << LLT::pointer(0) << '\n');
+                   << ", expected: " << LLT::pointer(0, 64) << '\n');
       return false;
     }
 
diff --git a/llvm/lib/Target/AArch64/AArch64MachineLegalizer.cpp b/llvm/lib/Target/AArch64/AArch64MachineLegalizer.cpp
index a3b52ffad36..13a2018ac58 100644
--- a/llvm/lib/Target/AArch64/AArch64MachineLegalizer.cpp
+++ b/llvm/lib/Target/AArch64/AArch64MachineLegalizer.cpp
@@ -26,7 +26,7 @@ using namespace llvm;
 
 AArch64MachineLegalizer::AArch64MachineLegalizer() {
   using namespace TargetOpcode;
-  const LLT p0 = LLT::pointer(0);
+  const LLT p0 = LLT::pointer(0, 64);
   const LLT s1 = LLT::scalar(1);
   const LLT s8 = LLT::scalar(8);
   const LLT s16 = LLT::scalar(16);