Merge pull request #7457 from practicalswift/gardening-20170214

diff --git a/lib/IDE/TypeReconstruction.cpp b/lib/IDE/TypeReconstruction.cpp
index 72aef4c..5386cd6 100644
--- a/lib/IDE/TypeReconstruction.cpp
+++ b/lib/IDE/TypeReconstruction.cpp
@@ -389,11 +389,6 @@
 
   bool HasSingleType() { return _types.size() == 1 && _types.front(); }
 
-  Type GetFirstType() {
-    // Must ensure there is a type prior to calling this
-    return _types.front();
-  }
-
   void Clear() {
     _module.Clear();
     _decls.clear();
diff --git a/lib/SILOptimizer/Mandatory/AddressLowering.cpp b/lib/SILOptimizer/Mandatory/AddressLowering.cpp
index 6823127..8fbb9c5 100644
--- a/lib/SILOptimizer/Mandatory/AddressLowering.cpp
+++ b/lib/SILOptimizer/Mandatory/AddressLowering.cpp
@@ -31,14 +31,6 @@
 using llvm::SmallSetVector;
 
 //===----------------------------------------------------------------------===//
-// Support for converting between value composition and address projection.
-//===----------------------------------------------------------------------===//
-
-/// TODO: List all operations that simply compose an aggregate from subobjects:
-/// tuple, struct, enum,
-bool isSubobjectCompsition(Operand &operand) { return false; }
-
-//===----------------------------------------------------------------------===//
 // ValueStorageMap: Map Opaque/Resilient SILValues to abstract storage units.
 //===----------------------------------------------------------------------===//
 
@@ -614,7 +606,7 @@
     assert(!pass.valueStorageMap.getStorage(tupleInst).storageAddress);
   }
 
-  void visitTupleExtractInst(TupleExtractInst *extractInst) {
+  void visitTupleExtractInst(TupleExtractInst *TEI) {
     // Tuple element instructions don't require rewrite. They are dead.
     llvm_unreachable("Untested.");
     return;