From 68e6b651a1879e8038870feff376ed3773ac062c Mon Sep 17 00:00:00 2001 From: Alexei Starovoitov Date: Tue, 7 Apr 2015 20:25:34 +0000 Subject: [PATCH] [bpf] fix build fix the build and remove unused variable warnings in Release mode. Patch by Brenden Blanco. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234349 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/BPF/BPFISelLowering.cpp | 6 ++---- lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/Target/BPF/BPFISelLowering.cpp b/lib/Target/BPF/BPFISelLowering.cpp index cdcf0936a3d..1ccb9ebe7e7 100644 --- a/lib/Target/BPF/BPFISelLowering.cpp +++ b/lib/Target/BPF/BPFISelLowering.cpp @@ -64,7 +64,7 @@ public: raw_string_ostream OS(Str); if (DLoc) { - DILocation DIL(DLoc.getAsMDNode()); + DILocation DIL(DLoc.get()); StringRef Filename = DIL.getFilename(); unsigned Line = DIL.getLineNumber(); unsigned Column = DIL.getColumnNumber(); @@ -537,12 +537,10 @@ SDValue BPFTargetLowering::LowerGlobalAddress(SDValue Op, MachineBasicBlock * BPFTargetLowering::EmitInstrWithCustomInserter(MachineInstr *MI, MachineBasicBlock *BB) const { - unsigned Opc = MI->getOpcode(); - const TargetInstrInfo &TII = *BB->getParent()->getSubtarget().getInstrInfo(); DebugLoc DL = MI->getDebugLoc(); - assert(Opc == BPF::Select && "Unexpected instr type to insert"); + assert(MI->getOpcode() == BPF::Select && "Unexpected instr type to insert"); // To "insert" a SELECT instruction, we actually have to insert the diamond // control-flow pattern. The incoming instruction knows the destination vreg diff --git a/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp b/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp index 280d2f1e57f..32d2ef56351 100644 --- a/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp +++ b/lib/Target/BPF/MCTargetDesc/BPFMCCodeEmitter.cpp @@ -76,9 +76,8 @@ unsigned BPFMCCodeEmitter::getMachineOpValue(const MCInst &MI, assert(MO.isExpr()); const MCExpr *Expr = MO.getExpr(); - MCExpr::ExprKind Kind = Expr->getKind(); - assert(Kind == MCExpr::SymbolRef); + assert(Expr->getKind() == MCExpr::SymbolRef); if (MI.getOpcode() == BPF::JAL) // func call name -- 2.34.1