diff --git a/lib/CodeGen/MachineBlockPlacement.cpp b/lib/CodeGen/MachineBlockPlacement.cpp
index 7eec164f148..b725bfb49c8 100644
--- a/lib/CodeGen/MachineBlockPlacement.cpp
+++ b/lib/CodeGen/MachineBlockPlacement.cpp
@@ -949,7 +949,6 @@ void MachineBlockPlacement::buildCFGChains(MachineFunction &F) {
   BlockChain &FunctionChain = *BlockToChain[&F.front()];
   buildChain(&F.front(), FunctionChain, BlockWorkList);
 
-  typedef SmallPtrSet<MachineBasicBlock *, 16> FunctionBlockSetType;
   DEBUG({
     // Crash at the end so we get all of the debugging output first.
     bool BadFunc = false;
diff --git a/tools/lli/ChildTarget/ChildTarget.cpp b/tools/lli/ChildTarget/ChildTarget.cpp
index 55fcae9def8..c177a047db1 100644
--- a/tools/lli/ChildTarget/ChildTarget.cpp
+++ b/tools/lli/ChildTarget/ChildTarget.cpp
@@ -99,6 +99,7 @@ void LLIChildTarget::handleAllocateSpace() {
   // Read and verify the message data size.
   uint32_t DataSize;
   int rc = ReadBytes(&DataSize, 4);
+  (void)rc;
   assert(rc == 4);
   assert(DataSize == 8);
 
diff --git a/tools/lli/RemoteTargetExternal.cpp b/tools/lli/RemoteTargetExternal.cpp
index 742a948c004..f6ed8496eb6 100644
--- a/tools/lli/RemoteTargetExternal.cpp
+++ b/tools/lli/RemoteTargetExternal.cpp
@@ -59,6 +59,7 @@ void RemoteTargetExternal::stop() {
 
 void RemoteTargetExternal::SendAllocateSpace(uint32_t Alignment, uint32_t Size) {
   int rc;
+  (void)rc;
   uint32_t MsgType = (uint32_t)LLI_AllocateSpace;
   rc = WriteBytes(&MsgType, 4);
   assert(rc == 4 && "Error writing message type.");