Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Author: gribozavr

Diff for: benchmark/CMakeLists.txt

@@ -65,6 +65,7 @@ set(SWIFT_BENCH_MODULES
     single-source/PopFrontGeneric
     single-source/Prims
     single-source/ProtocolDispatch
+    single-source/ProtocolDispatch2
     single-source/RangeAssignment
     single-source/RC4
     single-source/RecursiveOwnedParameter

Diff for: benchmark/scripts/generate_harness/generate_harness.py

@@ -40,14 +40,14 @@
              for x in glob.glob(os.path.join(single_source_dir, '*.swift'))]
 
     # CMakeList multi-source
-    class multi_source_bench(object):
+    class MultiSourceBench(object):
         def __init__(self, path):
             self.name = os.path.basename(path)
             self.files = [x for x in os.listdir(path)
                           if x.endswith('.swift')]
     if os.path.isdir(multi_source_dir):
         multisource_benches = [
-            multi_source_bench(os.path.join(multi_source_dir, x))
+            MultiSourceBench(os.path.join(multi_source_dir, x))
             for x in os.listdir(multi_source_dir)
             if os.path.isdir(os.path.join(multi_source_dir, x))
         ]

Diff for: benchmark/single-source/ProtocolDispatch2.swift

@@ -0,0 +1,64 @@
+//===--- ProtocolDispatch2.swift ------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//  This is a simple benchmark that tests the performance of calls to
+//  existential methods.
+//===----------------------------------------------------------------------===//
+
+
+import TestsUtils
+import Foundation
+
+protocol Pingable { func ping() -> Int;  func pong() -> Int}
+
+struct Game : Pingable {
+  func zero() -> Int { return 0}
+  func ping() -> Int { return 1}
+  func pong() -> Int { return 2}
+  func puff() -> Int { return 3}
+}
+
+@inline(never)
+func use_protocol(val : Int,_ game1 : Pingable, _ game2 : Pingable) -> Int {
+  var t = game1.ping() + game1.pong()
+  if (val % 2 == 0) {
+    t += game1.pong() + game1.ping()
+  }
+  t += game1.ping() + game1.pong()
+
+  t += game2.ping() + game2.pong()
+  if (val % 2 == 0) {
+    t += game2.pong() + game2.ping()
+  }
+  t += game2.ping() + game2.pong()
+
+  return t
+}
+
+@inline(never)
+func wrapper(val : Int,_ game1 : Pingable, _ game2 : Pingable) -> Int {
+  return use_protocol(val, game1, game2)
+}
+
+@inline(never)
+public func run_ProtocolDispatch2(N: Int) {
+  var c = 0
+  let g1 = Game()
+  let g2 = Game()
+  for _ in 1...N {
+    c = 0
+    for i in 1...5000 {
+      c += wrapper(i, g1, g2)
+    }
+  }
+  CheckResults(c == 75000, "IncorrectResults in ProtoDispatch")
+}
+

Diff for: benchmark/utils/main.swift

@@ -70,6 +70,7 @@ import PopFront
 import PopFrontGeneric
 import Prims
 import ProtocolDispatch
+import ProtocolDispatch2
 import RC4
 import RGBHistogram
 import RangeAssignment
@@ -147,6 +148,7 @@ precommitTests = [
   "PopFrontUnsafePointer": run_PopFrontUnsafePointer,
   "Prims": run_Prims,
   "ProtocolDispatch": run_ProtocolDispatch,
+  "ProtocolDispatch2": run_ProtocolDispatch2,
   "RC4": run_RC4,
   "RGBHistogram": run_RGBHistogram,
   "RangeAssignment": run_RangeAssignment,

Diff for: docs/SIL.rst

@@ -461,7 +461,7 @@ number of ways:
 
 - A SIL function type declares the conventions for its results.
   The results are written as an unlabelled tuple; the elements of that
-  tuple must be legal SIL types, optionally decoarted with one of the
+  tuple must be legal SIL types, optionally decorated with one of the
   following convention attributes.  Indirect and direct results may
   be interleaved.
 
@@ -2391,6 +2391,16 @@ The second operand may have either object or address type.  In the
 latter case, the dependency is on the current value stored in the
 address.
 
+strong_pin
+``````````
+
+TODO: Fill me in!
+
+strong_unpin
+````````````
+
+TODO: Fill me in!
+
 is_unique
 `````````
 

Diff for: docs/archive/LangRef.html

@@ -1300,8 +1300,6 @@ <h3 id="type-optional">Optional Types</h3>
         <li><code>func _doesOptionalHaveValueAsBool<T>(v : T?) -> Bool</code></li>
         <li><code>func _diagnoseUnexpectedNilOptional()</code></li>
         <li><code>func _getOptionalValue<T>(v : T?) -> T</code></li>
-        <li><code>func _injectValueIntoOptional<T>(v : T) -> T?</code></li>
-        <li><code>func _injectNothingIntoOptional<T>() -> T?</code></li>
       </ul>
     </p>
 

Diff for: include/swift/AST/PrintOptions.h

@@ -33,7 +33,7 @@ struct ArchetypeTransformContext {
   NominalTypeDecl *getNominal();
   PrinterArchetypeTransformer *getTransformer() { return Transformer.get(); }
   bool isPrintingSynthesizedExtension();
-  bool isPrintingTypeInteface();
+  bool isPrintingTypeInterface();
   ArchetypeTransformContext(PrinterArchetypeTransformer *Transformer);
   ArchetypeTransformContext(PrinterArchetypeTransformer *Transformer,
                             Type T);

Diff for: include/swift/IDE/ModuleInterfacePrinting.h

@@ -46,7 +46,7 @@ void printModuleInterface(ModuleDecl *M,
 // FIXME: this API should go away when Swift can represent Clang submodules as
 // 'swift::Module *' objects.
 void printSubmoduleInterface(ModuleDecl *M, ArrayRef<StringRef> FullModuleName,
-                             Optional<StringRef> GroupName,
+                             ArrayRef<StringRef> GroupNames,
                              ModuleTraversalOptions TraversalOptions,
                              ASTPrinter &Printer, const PrintOptions &Options,
                              const bool PrintSynthesizedExtensions);

Diff for: include/swift/SIL/SILArgument.h

@@ -40,7 +40,7 @@ inline bool isIndirectConvention(SILArgumentConvention convention) {
   return convention <= SILArgumentConvention::Indirect_Out;
 }
 
-/// Turn a ParameterConveneion into a SILArgumentConvention.
+/// Turn a ParameterConvention into a SILArgumentConvention.
 inline SILArgumentConvention getSILArgumentConvention(ParameterConvention conv){
   switch (conv) {
   case ParameterConvention::Indirect_In: