---

yaml
---
r: 225279
b: refs/heads/tensorflow-merge
c: 312bdb2
h: refs/heads/master
i:
  225277: 2c95821
  225275: bde8b3a
  225271: cf76a97
  225263: 811d8e9
  225247: 4789fe8
  225215: efafda2
  225151: f4ef673
  225023: 6ac6252
  224767: 1ca73cc
  224255: e310c51
  223231: 9282c7c
  221183: dfb6c16

Author: bob-wilson

[refs]

@@ -906,7 +906,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-06-14-a: 888f12b456d2b9b0e35518c1972bb
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-06-15-a: 683450174579052b46e32f3b8f7fcc6fe8127db9
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-06-16-a: 5d81d51e075adbc6128d5612ac1d9a43186d0396
 refs/heads/move-debugging-executables-into-its-own-section: 968835a1ac02f692a0f5d8ebd60949ab6b0f14bc
-refs/heads/tensorflow-merge: 8620bc619bd8b31ba2d757eea6c43efb44048f86
+refs/heads/tensorflow-merge: 312bdb2032dfc33e666f94617fdd56629d8a28aa
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-17-a: b947b41f2e23855c11bd483879813857b41e63ec
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-18-a: 76370219d53fcd9b9d7440166a992c9fd21909f7
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-19-a: 171b02e41ec9c3c8b592cecf7da70ab560d06cc5

branches/tensorflow-merge/benchmark/scripts/bench_code_size.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# ===--- run_smoke_bench -------------------------------------------------===//
+# ===--- Benchmark_Driver ------------------------------------------------===//
 #
 #  This source file is part of the Swift.org open source project
 #

branches/tensorflow-merge/benchmark/scripts/run_smoke_bench.py

@@ -1530,14 +1530,6 @@ ERROR(types_not_equal,none,
       (Type, Type, Type))
 ERROR(type_does_not_conform_owner,none,
       "%0 requires that %1 conform to %2", (Type, Type, Type))
-ERROR(type_does_not_conform_in_decl_ref,none,
-      "referencing %0 %1 on %2 requires that %3 conform to %4",
-      (DescriptiveDeclKind, DeclName, Type, Type, Type))
-ERROR(type_does_not_conform_decl_owner,none,
-      "%0 %1 requires that %2 conform to %3",
-      (DescriptiveDeclKind, DeclName, Type, Type))
-NOTE(where_type_does_not_conform_type,none,
-     "where %0 = %1", (Type, Type))
 NOTE(requirement_implied_by_conditional_conformance,none,
      "requirement from conditional conformance of %0 to %1", (Type, Type))
 NOTE(candidate_types_equal_requirement,none,

branches/tensorflow-merge/include/swift/AST/DiagnosticsSema.def

@@ -100,8 +100,7 @@ enum class SourceFileKind {
   Library,  ///< A normal .swift file.
   Main,     ///< A .swift file that can have top-level code.
   REPL,     ///< A virtual file that holds the user's input in the REPL.
-  SIL,      ///< Came from a .sil file.
-  Interface ///< Came from a .swiftinterface file, representing another module.
+  SIL       ///< Came from a .sil file.
 };
 
 /// Discriminator for resilience strategy.
@@ -1022,7 +1021,6 @@ class SourceFile final : public FileUnit {
       return true;
 
     case SourceFileKind::Library:
-    case SourceFileKind::Interface:
     case SourceFileKind::SIL:
       return false;
     }

branches/tensorflow-merge/include/swift/AST/Module.h

@@ -913,6 +913,13 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// the result would be the (parenthesized) type ((int, int)).
   Type getUnlabeledType(ASTContext &Context);
 
+  /// Retrieve the type without any labels around it. For example, given
+  /// \code
+  /// (p : int)
+  /// \endcode
+  /// the result would be the (unparenthesized) type 'int'.
+  Type getWithoutImmediateLabel();
+
   /// Retrieve the type without any parentheses around it.
   Type getWithoutParens();
 
@@ -937,6 +944,11 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// Otherwise, returns the type itself.
   Type getRValueType();
 
+  /// getRValueType - For an @lvalue type or tuple containing a single
+  /// non-variadic element, retrieves the underlying object type.
+  /// Otherwise, returns the type itself.
+  Type getRValueObjectType();
+
   /// getInOutObjectType - For an inout type, retrieves the underlying object
   /// type.  Otherwise, returns the type itself.
   Type getInOutObjectType();
@@ -946,7 +958,8 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// Otherwise, returns the type itself.
   Type getWithoutSpecifierType();
 
-  /// getRValueInstanceType - Looks through inout types and metatypes.
+  /// Retrieves the rvalue instance type, looking through single-element
+  /// tuples, inout types, and metatypes.
   Type getRValueInstanceType();
 
   /// For a ReferenceStorageType like @unowned, this returns the referent.
@@ -1890,6 +1903,16 @@ class TupleType final : public TypeBase, public llvm::FoldingSetNode,
   bool hasInOutElement() const {
     return static_cast<bool>(Bits.TupleType.HasInOutElement);
   }
+  
+  /// Returns true if this tuple has parenthesis semantics.
+  bool hasParenSema(bool allowName = false) const {
+    auto Fields = getElements();
+    if (Fields.size() != 1 || Fields[0].isVararg())
+     return false;
+    if (allowName)
+      return true;
+    return !Fields[0].hasName();
+  }
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const TypeBase *T) {
@@ -5146,6 +5169,17 @@ inline Type TypeBase::getInOutObjectType() {
   return this;
 }
 
+inline Type TypeBase::getRValueObjectType() {
+  Type type = this;
+
+  // Look through lvalue type.
+  if (auto lv = type->getAs<LValueType>())
+    type = lv->getObjectType();
+
+  // Look through argument list tuples.
+  return type->getWithoutImmediateLabel();
+}
+
 /// getWithoutSpecifierType - For a non-materializable type
 /// e.g. @lvalue or inout, retrieves the underlying object type.
 /// Otherwise, returns the type itself.

branches/tensorflow-merge/include/swift/AST/Types.h

@@ -30,6 +30,9 @@ class SourceManager {
   unsigned CodeCompletionBufferID = 0U;
   unsigned CodeCompletionOffset;
 
+  /// \brief The buffer ID where a hashbang line #! is allowed.
+  unsigned HashbangBufferID = 0U;
+
   /// Associates buffer identifiers to buffer IDs.
   llvm::StringMap<unsigned> BufIdentIDMap;
 
@@ -85,6 +88,15 @@ class SourceManager {
 
   SourceLoc getCodeCompletionLoc() const;
 
+  void setHashbangBufferID(unsigned BufferID) {
+    assert(HashbangBufferID == 0U && "Hashbang buffer ID already set");
+    HashbangBufferID = BufferID;
+  }
+
+  unsigned getHashbangBufferID() const {
+    return HashbangBufferID;
+  }
+
   /// Returns true if \c LHS is before \c RHS in the source buffer.
   bool isBeforeInBuffer(SourceLoc LHS, SourceLoc RHS) const {
     return LHS.Value.getPointer() < RHS.Value.getPointer();

branches/tensorflow-merge/include/swift/Basic/SourceManager.h

@@ -293,7 +293,7 @@ class CompilerInvocation {
   std::string getPCHHash() const;
 
   SourceFile::ImplicitModuleImportKind getImplicitModuleImportKind() {
-    if (getInputKind() == InputFileKind::SIL) {
+    if (getInputKind() == InputFileKind::IFK_SIL) {
       return SourceFile::ImplicitModuleImportKind::None;
     }
     if (getParseStdlib()) {
@@ -310,7 +310,7 @@ class CompilerInvocation {
                        bool alwaysSetModuleToMain, bool bePrimary,
                        serialization::ExtendedValidationInfo &extendedInfo);
   bool hasSerializedAST() {
-    return FrontendOpts.InputKind == InputFileKind::SwiftLibrary;
+    return FrontendOpts.InputKind == InputFileKind::IFK_Swift_Library;
   }
 
   const PrimarySpecificPaths &
@@ -507,10 +507,10 @@ class CompilerInstance {
   void setUpDiagnosticOptions();
   bool setUpModuleLoaders();
   bool isInputSwift() {
-    return Invocation.getInputKind() == InputFileKind::Swift;
+    return Invocation.getInputKind() == InputFileKind::IFK_Swift;
   }
   bool isInSILMode() {
-    return Invocation.getInputKind() == InputFileKind::SIL;
+    return Invocation.getInputKind() == InputFileKind::IFK_SIL;
   }
 
   bool setUpInputs();

branches/tensorflow-merge/include/swift/Frontend/Frontend.h

@@ -152,7 +152,6 @@ class FrontendInputsAndOutputs {
   // treat the input as LLVM_IR.
   bool shouldTreatAsLLVM() const;
   bool shouldTreatAsSIL() const;
-  bool shouldTreatAsModuleInterface() const;
 
   bool areAllNonPrimariesSIB() const;
 

branches/tensorflow-merge/include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -36,7 +36,7 @@ class FrontendOptions {
   FrontendInputsAndOutputs InputsAndOutputs;
 
   /// The kind of input on which the frontend should operate.
-  InputFileKind InputKind = InputFileKind::Swift;
+  InputFileKind InputKind = InputFileKind::IFK_Swift;
 
   void forAllOutputPaths(const InputFile &input,
                          llvm::function_ref<void(StringRef)> fn) const;
@@ -291,7 +291,7 @@ class FrontendOptions {
   StringRef determineFallbackModuleName() const;
 
   bool isCompilingExactlyOneSwiftFile() const {
-    return InputKind == InputFileKind::Swift &&
+    return InputKind == InputFileKind::IFK_Swift &&
            InputsAndOutputs.hasSingleInput();
   }
 

branches/tensorflow-merge/include/swift/Frontend/FrontendOptions.h

@@ -22,13 +22,12 @@
 namespace swift {
 
 enum class InputFileKind {
-  None,
-  Swift,
-  SwiftLibrary,
-  SwiftREPL,
-  SwiftModuleInterface,
-  SIL,
-  LLVM
+  IFK_None,
+  IFK_Swift,
+  IFK_Swift_Library,
+  IFK_Swift_REPL,
+  IFK_SIL,
+  IFK_LLVM_IR
 };
 
 // Inputs may include buffers that override contents, and eventually should

branches/tensorflow-merge/include/swift/Frontend/InputFile.h

@@ -50,6 +50,11 @@ void runAPIDiffMigratorPass(EditorAdapter &Editor,
                             SourceFile *SF,
                             const MigratorOptions &Opts);
 
+/// Run a pass to fix up new tuple interpretation in SE-0110.
+void runTupleSplatMigratorPass(EditorAdapter &Editor,
+                               SourceFile *SF,
+                               const MigratorOptions &Opts);
+
 } // end namespace migrator
 } // end namespace swift
 

branches/tensorflow-merge/include/swift/Migrator/ASTMigratorPass.h

@@ -51,11 +51,6 @@ enum class TriviaRetentionMode {
   WithTrivia,
 };
 
-enum class HashbangMode : bool {
-  Disallowed,
-  Allowed,
-};
-
 /// Kinds of conflict marker which the lexer might encounter.
 enum class ConflictMarkerKind {
   /// A normal or diff3 conflict marker, initiated by at least 7 "<"s,
@@ -103,9 +98,6 @@ class Lexer {
   /// file.  This enables the 'sil' keyword.
   const bool InSILMode;
 
-  /// True if we should skip past a `#!` line at the start of the file.
-  const bool IsHashbangAllowed;
-
   const CommentRetentionMode RetainComments;
 
   const TriviaRetentionMode TriviaRetention;
@@ -136,7 +128,7 @@ class Lexer {
   /// everything.
   Lexer(const PrincipalTag &, const LangOptions &LangOpts,
         const SourceManager &SourceMgr, unsigned BufferID,
-        DiagnosticEngine *Diags, bool InSILMode, HashbangMode HashbangAllowed,
+        DiagnosticEngine *Diags, bool InSILMode,
         CommentRetentionMode RetainComments,
         TriviaRetentionMode TriviaRetention);
 
@@ -159,14 +151,13 @@ class Lexer {
   Lexer(
       const LangOptions &Options, const SourceManager &SourceMgr,
       unsigned BufferID, DiagnosticEngine *Diags, bool InSILMode,
-      HashbangMode HashbangAllowed = HashbangMode::Disallowed,
       CommentRetentionMode RetainComments = CommentRetentionMode::None,
       TriviaRetentionMode TriviaRetention = TriviaRetentionMode::WithoutTrivia);
 
   /// \brief Create a lexer that scans a subrange of the source buffer.
   Lexer(const LangOptions &Options, const SourceManager &SourceMgr,
         unsigned BufferID, DiagnosticEngine *Diags, bool InSILMode,
-        HashbangMode HashbangAllowed, CommentRetentionMode RetainComments,
+        CommentRetentionMode RetainComments,
         TriviaRetentionMode TriviaRetention, unsigned Offset,
         unsigned EndOffset);