7 files changed, 5 insertions, 12 deletions
diff --git a/llvm/lib/Target/ARC/ARCISelLowering.cpp b/llvm/lib/Target/ARC/ARCISelLowering.cpp
index 0ec953f341a..bf98af80140 100644
--- a/llvm/lib/Target/ARC/ARCISelLowering.cpp
+++ b/llvm/lib/Target/ARC/ARCISelLowering.cpp
@@ -72,7 +72,7 @@ static ARCCC::CondCode ISDCCtoARCCC(ISD::CondCode isdCC) {
 
 ARCTargetLowering::ARCTargetLowering(const TargetMachine &TM,
                                      const ARCSubtarget &Subtarget)
-    : TargetLowering(TM), TM(TM), Subtarget(Subtarget) {
+    : TargetLowering(TM), Subtarget(Subtarget) {
   // Set up the register classes.
   addRegisterClass(MVT::i32, &ARC::GPR32RegClass);
 
diff --git a/llvm/lib/Target/ARC/ARCISelLowering.h b/llvm/lib/Target/ARC/ARCISelLowering.h
index cb06e9dcd79..fec01b13a86 100644
--- a/llvm/lib/Target/ARC/ARCISelLowering.h
+++ b/llvm/lib/Target/ARC/ARCISelLowering.h
@@ -76,7 +76,6 @@ public:
                              Instruction *I = nullptr) const override;
 
 private:
-  const TargetMachine &TM;
   const ARCSubtarget &Subtarget;
 
   // Lower Operand helpers
diff --git a/llvm/lib/Target/ARC/ARCMachineFunctionInfo.h b/llvm/lib/Target/ARC/ARCMachineFunctionInfo.h
index bfb3fdef5eb..95ad294e366 100644
--- a/llvm/lib/Target/ARC/ARCMachineFunctionInfo.h
+++ b/llvm/lib/Target/ARC/ARCMachineFunctionInfo.h
@@ -25,16 +25,15 @@ class ARCFunctionInfo : public MachineFunctionInfo {
   virtual void anchor();
   bool ReturnStackOffsetSet;
   int VarArgsFrameIndex;
-  unsigned VarArgFrameBytes;
   unsigned ReturnStackOffset;
 
 public:
   ARCFunctionInfo()
-      : ReturnStackOffsetSet(false), VarArgsFrameIndex(0), VarArgFrameBytes(0),
+      : ReturnStackOffsetSet(false), VarArgsFrameIndex(0),
         ReturnStackOffset(-1U), MaxCallStackReq(0) {}
 
   explicit ARCFunctionInfo(MachineFunction &MF)
-      : ReturnStackOffsetSet(false), VarArgsFrameIndex(0), VarArgFrameBytes(0),
+      : ReturnStackOffsetSet(false), VarArgsFrameIndex(0),
         ReturnStackOffset(-1U), MaxCallStackReq(0) {
     // Functions are 4-byte (2**2) aligned.
     MF.setAlignment(2);
diff --git a/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp b/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp
index 48431677bb7..0c627d04698 100644
--- a/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp
+++ b/llvm/lib/Target/ARC/InstPrinter/ARCInstPrinter.cpp
@@ -43,9 +43,8 @@ static const char *ARCBRCondCodeToString(ARCCC::BRCondCode BRCC) {
     return "lo";
   case ARCCC::BRHS:
     return "hs";
-  default:
-    llvm_unreachable("Unhandled ARCCC::BRCondCode");
   }
+  llvm_unreachable("Unhandled ARCCC::BRCondCode");
 }
 
 static const char *ARCCondCodeToString(ARCCC::CondCode CC) {
diff --git a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp
index b7e1bc36a6d..795fd0084aa 100644
--- a/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp
+++ b/llvm/lib/Target/Nios2/MCTargetDesc/Nios2TargetStreamer.cpp
@@ -19,4 +19,4 @@ Nios2TargetStreamer::Nios2TargetStreamer(MCStreamer &S) : MCTargetStreamer(S) {}
 
 Nios2TargetAsmStreamer::Nios2TargetAsmStreamer(MCStreamer &S,
                                                formatted_raw_ostream &OS)
-    : Nios2TargetStreamer(S), OS(OS) {}
+    : Nios2TargetStreamer(S) {}
diff --git a/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h b/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h
index 28d7ff0ec66..e9ed6e31d93 100644
--- a/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h
+++ b/llvm/lib/Target/Nios2/Nios2TargetObjectFile.h
@@ -16,8 +16,6 @@
 namespace llvm {
 
 class Nios2TargetObjectFile : public TargetLoweringObjectFileELF {
-  const Nios2TargetMachine *TM;
-
 public:
   Nios2TargetObjectFile() : TargetLoweringObjectFileELF() {}
 
diff --git a/llvm/lib/Target/Nios2/Nios2TargetStreamer.h b/llvm/lib/Target/Nios2/Nios2TargetStreamer.h
index 63e4e3ccdc6..1520ac27e94 100644
--- a/llvm/lib/Target/Nios2/Nios2TargetStreamer.h
+++ b/llvm/lib/Target/Nios2/Nios2TargetStreamer.h
@@ -22,8 +22,6 @@ public:
 
 // This part is for ascii assembly output
 class Nios2TargetAsmStreamer : public Nios2TargetStreamer {
-  formatted_raw_ostream &OS;
-
 public:
   Nios2TargetAsmStreamer(MCStreamer &S, formatted_raw_ostream &OS);
 };