commit 98ab4c64c429583a097adf98ae35ac4dd1dc2556
author Krzysztof Parzyszek <kparzysz@codeaurora.org> Mon Apr 24 19:48:51 2017 +0000
committer Krzysztof Parzyszek <kparzysz@codeaurora.org> Mon Apr 24 19:48:51 2017 +0000
tree 70bfc17504073c2113cb0bc4fc6a5a8d9dfee583
parent c0197066d786db4d04baadacfb3a88244e0026f4

Revert r301231: Accidentally committed stale files

I forgot to commit local changes before commit.

llvm-svn: 301232

llvm/lib/Target/AVR/AVRInstrInfo.cpp

diff --git a/llvm/lib/Target/AVR/AVRInstrInfo.cpp b/llvm/lib/Target/AVR/AVRInstrInfo.cpp
index 2074667..88f8892 100644
--- a/llvm/lib/Target/AVR/AVRInstrInfo.cpp
+++ b/llvm/lib/Target/AVR/AVRInstrInfo.cpp
@@ -142,9 +142,9 @@
       MFI.getObjectAlignment(FrameIndex));
 
   unsigned Opcode = 0;
-  if (TRI->hasType(*RC, MVT::i8)) {
+  if (RC->hasType(MVT::i8)) {
     Opcode = AVR::STDPtrQRr;
-  } else if (TRI->hasType(*RC, MVT::i16)) {
+  } else if (RC->hasType(MVT::i16)) {
     Opcode = AVR::STDWPtrQRr;
   } else {
     llvm_unreachable("Cannot store this register into a stack slot!");
@@ -176,9 +176,9 @@
       MFI.getObjectAlignment(FrameIndex));
 
   unsigned Opcode = 0;
-  if (TRI->hasType(*RC, MVT::i8)) {
+  if (RC->hasType(MVT::i8)) {
     Opcode = AVR::LDDRdPtrQ;
-  } else if (TRI->hasType(*RC, MVT::i16)) {
+  } else if (RC->hasType(MVT::i16)) {
     // Opcode = AVR::LDDWRdPtrQ;
     //:FIXME: remove this once PR13375 gets fixed
     Opcode = AVR::LDDWRdYQ;

llvm/lib/Target/AVR/AVRRegisterInfo.cpp

diff --git a/llvm/lib/Target/AVR/AVRRegisterInfo.cpp b/llvm/lib/Target/AVR/AVRRegisterInfo.cpp
index 50d4ff5..48798bd 100644
--- a/llvm/lib/Target/AVR/AVRRegisterInfo.cpp
+++ b/llvm/lib/Target/AVR/AVRRegisterInfo.cpp
@@ -78,12 +78,11 @@
 const TargetRegisterClass *
 AVRRegisterInfo::getLargestLegalSuperClass(const TargetRegisterClass *RC,
                                            const MachineFunction &MF) const {
-  const TargetRegisterInfo *TRI = MF.getSubtarget().getRegisterInfo();
-  if (TRI->hasType(*RC, MVT::i16)) {
+  if (RC->hasType(MVT::i16)) {
     return &AVR::DREGSRegClass;
   }
 
-  if (TRI->hasType(*RC, MVT::i8)) {
+  if (RC->hasType(MVT::i8)) {
     return &AVR::GPR8RegClass;
   }