Merge pull request #7869 from practicalswift/gardening-20170302

Author: swift-ci

include/swift/Runtime/Config.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_RUNTIME_CONFIG_H
 #define SWIFT_RUNTIME_CONFIG_H
 
+// Bring in visibility attribute macros for library visibility.
 #include "llvm/Support/Compiler.h"
 
 /// Does the current Swift platform support "unbridged" interoperation
@@ -187,9 +188,6 @@
 
 #endif
 
-// Bring in visibility attribute macros for library visibility.
-#include "llvm/Support/Compiler.h"
-
 // Generates a name of the runtime entry's implementation by
 // adding an underscore as a prefix and a suffix.
 #define SWIFT_RT_ENTRY_IMPL(Name) _##Name##_

include/swift/Syntax/UnknownSyntax.h

@@ -1,4 +1,4 @@
-//===--- UnknownSyntax.h - Swift Unknown Syntax Interface -----------------===//
+//===--- UnknownSyntax.h - Swift Unknown Syntax Interface -------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/Parse/ParseIfConfig.cpp

@@ -1,4 +1,4 @@
-//===--- ParseDecl.cpp - Swift Language Parser for #if directives -- ------===//
+//===--- ParseIfConfig.cpp - Swift Language Parser for #if directives -----===//
 //
 // This source file is part of the Swift.org open source project
 //

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -92,20 +92,6 @@ class ValueStorageMap {
 
     return valueVector.back().second;
   }
-
-  // Replace entry for `oldValue` with an entry for `newValue` preserving the
-  // the mapped ValueStorage.
-  void replaceValue(SILValue oldValue, SILValue newValue) {
-    auto hashIter = valueHashMap.find(oldValue);
-    assert(hashIter != valueHashMap.end() && "Missing SILValue");
-    unsigned idx = hashIter->second;
-    valueHashMap.erase(hashIter);
-
-    valueVector[idx].first = newValue;
-    
-    auto hashResult = valueHashMap.insert(std::make_pair(newValue, idx));
-    assert(hashResult.second && "SILValue already mapped");
-  }
 };
 } // end anonymous namespace
 

test/APINotes/Inputs/custom-frameworks/APINotesFrameworkTest.framework/Headers/Types.h

@@ -1,7 +1,7 @@
 #pragma clang assume_nonnull begin
 
 struct __attribute__((swift_name("VeryImportantCStruct"))) SomeCStruct {
-	int field;
+    int field;
 };
 
 #pragma clang assume_nonnull end

unittests/runtime/Refcounting.cpp

@@ -180,7 +180,7 @@ TEST(RefcountingTest, isUniquelyReferencedOrPinned) {
   // RC big, unpinned
   EXPECT_FALSE(swift_isUniquelyReferencedOrPinned_nonNull_native(object));
 
-  auto pinResult = swift_tryPin(object);
+  swift_tryPin(object);
   // RC big, pinned
   EXPECT_TRUE(swift_isUniquelyReferencedOrPinned_nonNull_native(object));
 

unittests/runtime/weak.mm

@@ -14,7 +14,6 @@
 #include <objc/runtime.h>
 #include "swift/Runtime/HeapObject.h"
 #include "swift/Runtime/Metadata.h"
-#include "swift/Runtime/Metadata.h"
 #include "gtest/gtest.h"
 
 using namespace swift;