Merge branch 'master' of https://github.com/apple/swift

Author: kstaring

.pep8

@@ -1,2 +1,2 @@
 [flake8]
-filename = *.py,80+-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,gyb,line-directive,mock-distcc,ns-html2rst,recursive-lipo,rth,run-test,submit-benchmark-results,update-checkout,viewcfg,backtrace-check,coverage-build-db,coverage-generate-data,coverage-touch-tests
+filename = *.py,80+-check,backtrace-check,Benchmark_Driver,Benchmark_DTrace.in,Benchmark_GuardMalloc.in,Benchmark_RuntimeLeaksRunner.in,build-script,check-incremental,clang++,coverage-build-db,coverage-generate-data,coverage-touch-tests,gyb,ld,line-directive,mock-distcc,ns-html2rst,PathSanitizingFileCheck,recursive-lipo,rth,run-test,submit-benchmark-results,update-checkout,viewcfg

benchmark/scripts/compare_perf_tests.py

@@ -71,6 +71,9 @@
 PAIN_DETAIL = """
 {0}: {1}"""
 
+RATIO_MIN = None
+RATIO_MAX = None
+
 
 def main():
     global RATIO_MIN
@@ -146,11 +149,11 @@ def main():
 
     ratio_total = 0
     for key in new_results.keys():
-            ratio = (old_results[key]+0.001)/(new_results[key]+0.001)
+            ratio = (old_results[key] + 0.001) / (new_results[key] + 0.001)
             ratio_list[key] = round(ratio, 2)
             ratio_total *= ratio
-            delta = (((float(new_results[key]+0.001) /
-                      (old_results[key]+0.001)) - 1) * 100)
+            delta = (((float(new_results[key] + 0.001) /
+                      (old_results[key] + 0.001)) - 1) * 100)
             delta_list[key] = round(delta, 2)
             if ((old_results[key] < new_results[key] and
                 new_results[key] < old_max_results[key]) or
@@ -174,17 +177,17 @@ def main():
     delta_width = max_width(delta_list, title='DELTA (%)')
 
     markdown_table_header = "\n" + MARKDOWN_ROW.format(
-                                        "TEST".ljust(test_name_width),
-                                        old_branch.ljust(old_time_width),
-                                        new_branch.ljust(new_time_width),
-                                        "DELTA (%)".ljust(delta_width),
-                                        "SPEEDUP".ljust(2))
+        "TEST".ljust(test_name_width),
+        old_branch.ljust(old_time_width),
+        new_branch.ljust(new_time_width),
+        "DELTA (%)".ljust(delta_width),
+        "SPEEDUP".ljust(2))
     markdown_table_header += MARKDOWN_ROW.format(
-                                         HEADER_SPLIT.ljust(test_name_width),
-                                         HEADER_SPLIT.ljust(old_time_width),
-                                         HEADER_SPLIT.ljust(new_time_width),
-                                         HEADER_SPLIT.ljust(delta_width),
-                                         HEADER_SPLIT.ljust(2))
+        HEADER_SPLIT.ljust(test_name_width),
+        HEADER_SPLIT.ljust(old_time_width),
+        HEADER_SPLIT.ljust(new_time_width),
+        HEADER_SPLIT.ljust(delta_width),
+        HEADER_SPLIT.ljust(2))
     markdown_regression = ""
     for i, key in enumerate(decreased_perf_list):
         ratio = "{0:.2f}x".format(ratio_list[key])

benchmark/single-source/NSDictionaryCastToSwift.swift

@@ -14,7 +14,7 @@
 // rdar://problem/18539730
 //
 // Description:
-//     Create a NSDictionary instance and cast it to [String: NSObject].
+//     Create an NSDictionary instance and cast it to [String: NSObject].
 import Foundation
 import TestsUtils
 

docs/ContinuousIntegration.md

@@ -35,8 +35,8 @@ We describe each in detail below:
 
         Platform     | Comment | Check Status
         ------------ | ------- | ------------
-        All supported platforms     | @swift-ci Please smoke test       		 | Swift Test Linux Platform (smoke test) <br> Swift Test OS X Platform (smoke test)
-        All supported platforms     | @swift-ci Please smoke test and merge		 | Swift Test Linux Platform (smoke test) <br> Swift Test OS X Platform (smoke test)
+        All supported platforms     | @swift-ci Please smoke test                | Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)
+        All supported platforms     | @swift-ci Please smoke test and mere       | Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)
         OS X platform               | @swift-ci Please smoke test OS X platform  | Swift Test OS X Platform (smoke test)
         Linux platform              | @swift-ci Please smoke test Linux platform | Swift Test Linux Platform (smoke test)
 
@@ -66,14 +66,14 @@ A smoke test on Linux does the following:
 
         Platform     | Comment | Check Status
         ------------ | ------- | ------------
-        All supported platforms     | @swift-ci Please test							| Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)<br>Swift Test Linux Platform<br>Swift Test OS X Platform<br>  
-        All supported platforms     | @swift-ci Please clean test					| Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)<br>Swift Test Linux Platform<br>Swift Test OS X Platform<br>  
-        All supported platforms     | @swift-ci Please test and merge				| Swift Test Linux Platform (smoke test) <br> Swift Test OS X Platform (smoke test)<br> Swift Test Linux Platform <br>Swift Test OS X Platform
-        OS X platform               | @swift-ci Please test OS X platform 			| Swift Test OS X Platform (smoke test)<br>Swift Test OS X Platform
+        All supported platforms     | @swift-ci Please test                         | Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)<br>Swift Test Linux Platform<br>Swift Test OS X Platform<br>  
+        All supported platforms     | @swift-ci Please clean test                   | Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)<br>Swift Test Linux Platform<br>Swift Test OS X Platform<br>  
+        All supported platforms     | @swift-ci Please test and merge               | Swift Test Linux Platform (smoke test)<br>Swift Test OS X Platform (smoke test)<br> Swift Test Linux Platform <br>Swift Test OS X Platform
+        OS X platform               | @swift-ci Please test OS X platform           | Swift Test OS X Platform (smoke test)<br>Swift Test OS X Platform
         OS X platform               | @swift-ci Please clean test OS X platform     | Swift Test OS X Platform (smoke test)<br>Swift Test OS X Platform
         OS X platform               | @swift-ci Please benchmark                    | Swift Benchmark on OS X Platform
-        Linux platform              | @swift-ci Please test Linux platform          | Swift Test Linux Platform (smoke test) <br> Swift Test Linux Platform
-        Linux platform              | @swift-ci Please clean test Linux platform    | Swift Test Linux Platform (smoke test) <br> Swift Test Linux Platform
+        Linux platform              | @swift-ci Please test Linux platform          | Swift Test Linux Platform (smoke test)<br>Swift Test Linux Platform
+        Linux platform              | @swift-ci Please clean test Linux platform    | Swift Test Linux Platform (smoke test)<br>Swift Test Linux Platform
 
 The core principles of validation testing is that:
 
@@ -118,25 +118,32 @@ A validation test on Linux does the following:
 
 ## Cross Repository Testing
 
-Currently @swift-ci pull request testing only supports testing changes against individual repositories. This is something that will most likely be fixed in the future. But in the short term, please follow the following workflow for performing cross repository testing:
+Simply provide the URL from corresponding pull requests in the same comment as "@swift-ci Please test" phrase. List all of the pull requests and then provide the specific test phrase you would like to trigger. Currently, it will only merge the main pull request you requested testing from as opposed to all of the PR's. 
 
-1. Make sure that all repos have been checked out:
+For example:   
 
-     ./swift/utils/update-checkout --clone
+```
+Please test with following pull request:
+https://github.com/apple/swift/pull/4574
 
-2. On Darwin and Linux run:
+@swift-ci Please test Linux platform
+```
 
-     ./swift/utils/build-toolchain local.swift
+```
+Please test with following PR:
+https://github.com/apple/swift-lldb/pull/48
+https://github.com/apple/swift-package-manager/pull/632
 
-If everything passes, a .tar.gz package file will be produced in the . directory.
+@swift-ci Please test macOS platform
+```
 
-3. Create a separate PR for each repository that needs to be changed. Each should reference the main Swift PR and create a reference to all of the others from the main PR.
+1. Create a separate PR for each repository that needs to be changed. Each should reference the main Swift PR and create a reference to all of the others from the main PR.
 
-4. Gate all commits on @swift-ci smoke test and merge. As stated above, it is important that *all* checkins perform PR testing since if breakage enters the tree PR testing becomes less effective. If you have done local testing (using build-toolchain) and have made appropriate changes to the other repositories then perform a smoke test and merge should be sufficient for correctness. This is not meant to check for correctness in your commits, but rather to be sure that no one landed changes in other repositories or in swift that cause your PR to no longer be correct. If you were unable to make workarounds to th eother repositories, this smoke test will break *after* Swift has built. Check the log to make sure that it is the expected failure for that platform/repository that coincides with the failure your PR is supposed to fix.
+2. Gate all commits on @swift-ci smoke test and merge. As stated above, it is important that *all* checkins perform PR testing since if breakage enters the tree PR testing becomes less effective. If you have done local testing (using build-toolchain) and have made appropriate changes to the other repositories then perform a smoke test and merge should be sufficient for correctness. This is not meant to check for correctness in your commits, but rather to be sure that no one landed changes in other repositories or in swift that cause your PR to no longer be correct. If you were unable to make workarounds to th eother repositories, this smoke test will break *after* Swift has built. Check the log to make sure that it is the expected failure for that platform/repository that coincides with the failure your PR is supposed to fix.
 
-5. Merge all of the pull requests simultaneously.
+3. Merge all of the pull requests simultaneously.
 
-6. Watch the public incremental build on ci.swift.org to make sure that you did not make any mistakes. It should complete within 30-40 minutes depending on what else was being committed in the mean time.
+4. Watch the public incremental build on ci.swift.org to make sure that you did not make any mistakes. It should complete within 30-40 minutes depending on what else was being committed in the mean time.
 
 
 ## ci.swift.org bots

docs/HighLevelSILOptimizations.rst

@@ -165,6 +165,7 @@ array.uninitialized(count: Builtin.Word) -> (Array<Element>, Builtin.RawPointer)
   The caller is responsible for writing the elements to the element storage.
 
 array.props.isCocoa/needsElementTypeCheck -> Bool
+
   Reads storage descriptors properties (isCocoa, needsElementTypeCheck).
   This is not control dependent or guarded. The optimizer has
   semantic knowledge of the state transfer those properties cannot make:

docs/proposals/TypeState.rst

@@ -127,7 +127,7 @@ dimensions without having to manually manage a matrix of states.  This seems
 particularly useful in cases where you have inheritance.  A base class may
 define its own set of states.  A derived class will have those states, plus
 additional dimensions if they wanted.  For example, an NSView could be visible
-or not, while a NSButton derived class could be Normal or Pressed Down, etc.
+or not, while an NSButton derived class could be Normal or Pressed Down, etc.
 
 Generics: "mechanisms like type parameterization need to be duplicated for
 typestate, so that we can talk not only about a list of files, but also about a

include/swift/AST/Builtins.def

@@ -259,7 +259,7 @@ BUILTIN_SIL_OPERATION(GepRaw, "gepRaw", Integer)
 
 /// Gep (Builtin.RawPointer, Builtin.Word, T.Type) -> Builtin.RawPointer
 ///
-/// Like the GepRaw-bultin, but multiplies the index by stride-of type 'T'.
+/// Like the GepRaw-builtin, but multiplies the index by stride-of type 'T'.
 BUILTIN_SIL_OPERATION(Gep, "gep", Integer)
 
 /// getTailAddr(Builtin.RawPointer,

include/swift/AST/Expr.h

@@ -1753,7 +1753,7 @@ class DynamicSubscriptExpr final
 /// bar.foo.  These always have unresolved type.
 class UnresolvedMemberExpr final
     : public Expr,
-      public TrailingCallArguments<UnresolvedMemberExpr>  {
+      public TrailingCallArguments<UnresolvedMemberExpr> {
   SourceLoc DotLoc;
   DeclNameLoc NameLoc;
   DeclName Name;

lib/AST/ASTPrinter.cpp

@@ -3358,7 +3358,6 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
 
   ASTPrinter &Printer;
   const PrintOptions &Options;
-  Optional<std::vector<GenericParamList *>> UnwrappedGenericParams;
 
   /// Whether we are printing something in a function parameter position, and
   /// thus want to print @escaping if it escapes.

lib/AST/ASTScope.cpp

@@ -132,7 +132,7 @@ ASTScope::ASTScope(const ASTScope *parent, ArrayRef<ASTScope *> children)
 
   // Add child nodes, reparenting them to this node.
   storedChildren.reserve(children.size());
-  for (auto child : children ) {
+  for (auto child : children) {
     child->parentAndExpanded.setPointer(this);
     storedChildren.push_back(child);
   }
@@ -592,7 +592,7 @@ void ASTScope::expand() const {
     break;
 
   case ASTScopeKind::Accessors: {
-    // Add children for all of the the explicitly-written accessors.
+    // Add children for all of the explicitly-written accessors.
     SmallVector<ASTScope *, 4> accessors;
     auto addAccessor = [&](FuncDecl *accessor) {
       if (!accessor) return;

lib/AST/ArchetypeBuilder.cpp

@@ -1196,7 +1196,7 @@ bool ArchetypeBuilder::addSameTypeRequirementBetweenArchetypes(
   // along back edges.
   bool creatingCycle = false;
   auto T2Parent = T2;
-  while(T2Parent != nullptr) {
+  while (T2Parent != nullptr) {
     if (T2Parent->getRepresentative() == T1)
       creatingCycle = true;
     T2Parent = T2Parent->getParent();

lib/IDE/CodeCompletion.cpp

@@ -3066,16 +3066,6 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     return false;
   }
 
-  bool isOptionSetDecl(NominalTypeDecl *D) {
-    auto optionSetType = dyn_cast<ProtocolDecl>(Ctx.getOptionSetDecl());
-    if (!optionSetType)
-      return false;
-
-    SmallVector<ProtocolConformance *, 1> conformances;
-    return D->lookupConformance(CurrDeclContext->getParentModule(),
-                                optionSetType, conformances);
-  }
-
   void getTupleExprCompletions(TupleType *ExprType) {
     unsigned Index = 0;
     for (auto TupleElt : ExprType->getElements()) {

lib/IRGen/GenClass.cpp

@@ -575,7 +575,7 @@ Address irgen::emitTailProjection(IRGenFunction &IGF, llvm::Value *Base,
 
 /// Try to stack promote a class instance with possible tail allocated arrays.
 ///
-/// Returns the alloca if successfull, or nullptr otherwise.
+/// Returns the alloca if successful, or nullptr otherwise.
 static llvm::Value *stackPromote(IRGenFunction &IGF,
                       const StructLayout &ClassLayout,
                       int &StackAllocSize,

lib/Parse/ParseType.cpp

@@ -464,7 +464,7 @@ ParserResult<TypeRepr> Parser::parseTypeIdentifierOrTypeComposition() {
       SmallString<32> replacement;
       auto Begin = Protocols.begin();
       replacement += extractText(*Begin);
-      while(++Begin != Protocols.end()) {
+      while (++Begin != Protocols.end()) {
         replacement += " & ";
         replacement += extractText(*Begin);
       }

lib/SILGen/RValue.cpp

@@ -560,16 +560,15 @@ RValue RValue::extractElement(unsigned n) && {
   assert(isComplete() && "rvalue is not complete");
 
   CanTupleType tupleTy = dyn_cast<TupleType>(type);
-	if (!tupleTy) {
-		assert(n == 0);
+  if (!tupleTy) {
+    assert(n == 0);
     unsigned to = getRValueSize(type);
-		assert(to == values.size());
-		RValue element({llvm::makeArrayRef(values).slice(0, to), type});
-		makeUsed();
-		return element;
+    assert(to == values.size());
+    RValue element({llvm::makeArrayRef(values).slice(0, to), type});
+    makeUsed();
+    return element;
   }
 
-
   auto range = getElementRange(tupleTy, n);
   unsigned from = range.first, to = range.second;
 
@@ -583,12 +582,12 @@ void RValue::extractElements(SmallVectorImpl<RValue> &elements) && {
   assert(isComplete() && "rvalue is not complete");
 
   CanTupleType tupleTy = dyn_cast<TupleType>(type);
-	if (!tupleTy) {
+  if (!tupleTy) {
     unsigned to = getRValueSize(type);
-		assert(to == values.size());
-		elements.push_back({llvm::makeArrayRef(values).slice(0, to), type});
-		makeUsed();
-		return;
+    assert(to == values.size());
+    elements.push_back({llvm::makeArrayRef(values).slice(0, to), type});
+    makeUsed();
+    return;
   }
 
   unsigned from = 0;

lib/SILGen/SILGenApply.cpp

@@ -2976,25 +2976,25 @@ namespace {
       if (arg.isRValue()) {
         if (CanTupleType substArgType =
                 dyn_cast<TupleType>(arg.getSubstType())) {
-	  // The original type isn't necessarily a tuple.
-	  assert(origParamType.matchesTuple(substArgType));
-
-	  auto loc = arg.getKnownRValueLocation();
-	  SmallVector<RValue, 4> elts;
-	  std::move(arg).asKnownRValue().extractElements(elts);
-	  for (auto i : indices(substArgType.getElementTypes())) {
-	    emit({ loc, std::move(elts[i]) },
-		 origParamType.getTupleElementType(i));
-	  }
-	  return;
-	}
-
-	auto loc = arg.getKnownRValueLocation();
-	SmallVector<RValue, 1> elts;
-	std::move(arg).asKnownRValue().extractElements(elts);
-	emit({ loc, std::move(elts[0]) },
-  	       origParamType.getTupleElementType(0));
-	return;
+          // The original type isn't necessarily a tuple.
+          assert(origParamType.matchesTuple(substArgType));
+
+          auto loc = arg.getKnownRValueLocation();
+          SmallVector<RValue, 4> elts;
+          std::move(arg).asKnownRValue().extractElements(elts);
+          for (auto i : indices(substArgType.getElementTypes())) {
+            emit({ loc, std::move(elts[i]) },
+                 origParamType.getTupleElementType(i));
+          }
+          return;
+        }
+
+        auto loc = arg.getKnownRValueLocation();
+        SmallVector<RValue, 1> elts;
+        std::move(arg).asKnownRValue().extractElements(elts);
+        emit({ loc, std::move(elts[0]) },
+             origParamType.getTupleElementType(0));
+        return;
       }
 
       // Otherwise, we're working with an expression.