---

yaml
---
r: 294647
b: refs/heads/tensorflow
c: 3b02901
h: refs/heads/master
i:
  294645: 902ae53
  294643: dde344d
  294639: 34937f7

Author: gottesmm

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: ad79bbaf860a3281b72d9f775b7cbfde57e30639
+refs/heads/tensorflow: 3b029010b9293538cd66fce7b76aaa6fe7a59137
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/CHANGELOG.md

@@ -26,28 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-8974][]:
-
-  Duplicate tuple element labels are no longer allowed, because it leads
-  to incorrect behavior. For example:
-
-  ```
-  let dupLabels: (foo: Int, foo: Int) = (foo: 1, foo: 2)
-
-  enum Foo { case bar(x: Int, x: Int) }
-  let f: Foo = .bar(x: 0, x: 1)
-  ```
-
-  will now be diagnosed as an error. 
-
-  Note: You can still use duplicate labels when declaring functions and
-  subscripts, as long as the internal labels are different. For example:
-
-  ```
-  func foo(bar x: Int, bar y: Int) {}
-  subscript(a x: Int, a y: Int) -> Int {}
-  ```
-
 * [SR-6118][]:
 
   Subscripts can now declare default arguments:
@@ -7718,6 +7696,5 @@ Swift 1.0
 [SR-7799]: <https://bugs.swift.org/browse/SR-7799>
 [SR-8109]: <https://bugs.swift.org/browse/SR-8109>
 [SR-8546]: <https://bugs.swift.org/browse/SR-8546>
-[SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>

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

@@ -3523,8 +3523,6 @@ ERROR(tuple_single_element,none,
       "cannot create a single-element tuple with an element label", ())
 ERROR(tuple_ellipsis,none,
       "cannot create a variadic tuple", ())
-ERROR(tuple_duplicate_label,none,
-      "cannot create a tuple with a duplicate element label", ())
 ERROR(enum_element_ellipsis,none,
       "variadic enum cases are not supported", ())
 

branches/tensorflow/include/swift/AST/Expr.h

@@ -953,25 +953,15 @@ class TapExpr : public Expr {
 class InterpolatedStringLiteralExpr : public LiteralExpr {
   /// Points at the beginning quote.
   SourceLoc Loc;
-  /// Points at the ending quote.
-  /// Needed for the upcoming \c ASTScope subsystem because lookups can be
-  /// targeted to inside an \c InterpolatedStringLiteralExpr. It would be nicer
-  /// to use \c EndLoc for this value, but then \c Lexer::getLocForEndOfToken()
-  /// would not work for \c stringLiteral->getEndLoc().
-  SourceLoc TrailingQuoteLoc;
   TapExpr *AppendingExpr;
   Expr *SemanticExpr;
 
 public:
-  InterpolatedStringLiteralExpr(SourceLoc Loc,
-                                SourceLoc TrailingQuoteLoc,
-                                unsigned LiteralCapacity,
+  InterpolatedStringLiteralExpr(SourceLoc Loc, unsigned LiteralCapacity, 
                                 unsigned InterpolationCount,
                                 TapExpr *AppendingExpr)
       : LiteralExpr(ExprKind::InterpolatedStringLiteral, /*Implicit=*/false),
-        Loc(Loc),
-        TrailingQuoteLoc(TrailingQuoteLoc),
-        AppendingExpr(AppendingExpr), SemanticExpr() {
+        Loc(Loc), AppendingExpr(AppendingExpr), SemanticExpr() {
     Bits.InterpolatedStringLiteralExpr.InterpolationCount = InterpolationCount;
     Bits.InterpolatedStringLiteralExpr.LiteralCapacity = LiteralCapacity;
   }
@@ -1008,11 +998,6 @@ class InterpolatedStringLiteralExpr : public LiteralExpr {
     // token, so the range should be (Start == End).
     return Loc;
   }
-  SourceLoc getTrailingQuoteLoc() const {
-    // Except when computing a SourceRange for an ASTScope. Then the range
-    // must be (Start - TrainingQuoteLoc).
-    return TrailingQuoteLoc;
-  }
 
   /// Call the \c callback with information about each segment in turn.
   void forEachSegment(ASTContext &Ctx,

branches/tensorflow/include/swift/Serialization/ModuleFormat.h

@@ -52,7 +52,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 493; // dependency types for structs
+const uint16_t SWIFTMODULE_VERSION_MINOR = 491; // mangled class names as vtable keys
 
 using DeclIDField = BCFixed<31>;
 
@@ -948,8 +948,7 @@ namespace decls_block {
     GenericEnvironmentIDField, // generic environment
     AccessLevelField,       // access level
     BCVBR<4>,               // number of conformances
-    BCVBR<4>,               // number of inherited types
-    BCArray<TypeIDField>    // inherited types, followed by dependency types
+    BCArray<TypeIDField>    // inherited types
     // Trailed by the generic parameters (if any), the members record, and
     // finally conformance info (if any).
   >;
@@ -982,8 +981,7 @@ namespace decls_block {
     TypeIDField,            // superclass
     AccessLevelField,       // access level
     BCVBR<4>,               // number of conformances
-    BCVBR<4>,               // number of inherited types
-    BCArray<TypeIDField>    // inherited types, followed by dependency types
+    BCArray<TypeIDField>    // inherited types
     // Trailed by the generic parameters (if any), the members record, and
     // finally conformance info (if any).
   >;

branches/tensorflow/lib/AST/ASTDumper.cpp

@@ -1930,19 +1930,7 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
   }
   void visitInterpolatedStringLiteralExpr(InterpolatedStringLiteralExpr *E) {
     printCommon(E, "interpolated_string_literal_expr");
-    
-    // Print the trailing quote location
-    if (auto Ty = GetTypeOfExpr(E)) {
-      auto &Ctx = Ty->getASTContext();
-      auto TQL = E->getTrailingQuoteLoc();
-      if (TQL.isValid()) {
-        PrintWithColorRAII(OS, LocationColor) << " trailing_quote_loc=";
-        TQL.print(PrintWithColorRAII(OS, LocationColor).getOS(),
-                  Ctx.SourceMgr);
-      }
-    }
-    PrintWithColorRAII(OS, LiteralValueColor)
-      << " literal_capacity="
+    PrintWithColorRAII(OS, LiteralValueColor) << " literal_capacity=" 
       << E->getLiteralCapacity() << " interpolation_count="
       << E->getInterpolationCount() << '\n';
     printRec(E->getAppendingExpr());

branches/tensorflow/lib/AST/Expr.cpp

@@ -813,7 +813,6 @@ static LiteralExpr *
 shallowCloneImpl(const InterpolatedStringLiteralExpr *E, ASTContext &Ctx,
                  llvm::function_ref<Type(const Expr *)> getType) {
   auto res = new (Ctx) InterpolatedStringLiteralExpr(E->getLoc(),
-                                                     E->getTrailingQuoteLoc(),
                                                      E->getLiteralCapacity(),
                                                      E->getInterpolationCount(),
                                                      E->getAppendingExpr());

branches/tensorflow/lib/IDE/REPLCodeCompletion.cpp

@@ -16,7 +16,6 @@
 
 #include "swift/IDE/REPLCodeCompletion.h"
 #include "swift/AST/ASTContext.h"
-#include "swift/AST/DiagnosticSuppression.h"
 #include "swift/AST/Module.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceManager.h"
@@ -194,7 +193,7 @@ doCodeCompletion(SourceFile &SF, StringRef EnteredCode, unsigned *BufferID,
                  CodeCompletionCallbacksFactory *CompletionCallbacksFactory) {
   // Temporarily disable printing the diagnostics.
   ASTContext &Ctx = SF.getASTContext();
-  DiagnosticSuppression SuppressedDiags(Ctx.Diags);
+  DiagnosticTransaction DelayedDiags(Ctx.Diags);
 
   std::string AugmentedCode = EnteredCode.str();
   AugmentedCode += '\0';
@@ -223,10 +222,7 @@ doCodeCompletion(SourceFile &SF, StringRef EnteredCode, unsigned *BufferID,
   // Now we are done with code completion.  Remove the declarations we
   // temporarily inserted.
   SF.Decls.resize(OriginalDeclCount);
-
-  // Reset the error state because it's only relevant to the code that we just
-  // processed, which now gets thrown away.
-  Ctx.Diags.resetHadAnyError();
+  DelayedDiags.abort();
 }
 
 void REPLCompletions::populate(SourceFile &SF, StringRef EnteredCode) {

branches/tensorflow/lib/Parse/ParseExpr.cpp

@@ -2039,8 +2039,8 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
     // Return an error, but include an empty InterpolatedStringLiteralExpr
     // so that parseDeclPoundDiagnostic() can figure out why this string
     // literal was bad.
-    return makeParserErrorResult(new (Context) InterpolatedStringLiteralExpr(
-        Loc, Loc.getAdvancedLoc(CloseQuoteBegin), 0, 0, nullptr));
+    return makeParserErrorResult(
+        new (Context) InterpolatedStringLiteralExpr(Loc, 0, 0, nullptr));
   }
 
   unsigned LiteralCapacity = 0;
@@ -2093,8 +2093,7 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
   }
 
   return makeParserResult(Status, new (Context) InterpolatedStringLiteralExpr(
-                                      Loc, Loc.getAdvancedLoc(CloseQuoteBegin),
-                                      LiteralCapacity, InterpolationCount,
+                                      Loc, LiteralCapacity, InterpolationCount,
                                       AppendingExpr));
 }
 

branches/tensorflow/lib/Parse/ParseIfConfig.cpp

@@ -17,7 +17,6 @@
 #include "swift/Parse/Parser.h"
 
 #include "swift/AST/ASTVisitor.h"
-#include "swift/AST/DiagnosticSuppression.h"
 #include "swift/Basic/Defer.h"
 #include "swift/Basic/LangOptions.h"
 #include "swift/Basic/Version.h"
@@ -639,12 +638,6 @@ ParserResult<IfConfigDecl> Parser::parseIfConfig(
     SmallVector<ASTNode, 16> Elements;
     if (isActive || !isVersionCondition) {
       parseElements(Elements, isActive);
-    } else if (SyntaxContext->isEnabled()) {
-      // We shouldn't skip code if we are building syntax tree.
-      // The parser will keep running and we just discard the AST part.
-      DiagnosticSuppression suppression(Context.Diags);
-      SmallVector<ASTNode, 16> dropedElements;
-      parseElements(dropedElements, false);
     } else {
       DiagnosticTransaction DT(Diags);
       skipUntilConditionalBlockClose();

branches/tensorflow/lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

@@ -88,8 +88,7 @@ static void fixupReferenceCounts(
   DeadEndBlocks deadEndBlocks(pai->getFunction());
   SmallVector<SILBasicBlock *, 4> leakingBlocks;
 
-  auto errorBehavior =
-      ownership::ErrorBehaviorKind::ReturnFalseOnLeakAssertOtherwise;
+  auto errorBehavior = ownership::ErrorBehaviorKind::ReturnFalse;
 
   // Add a copy of each non-address type capture argument to lifetime extend the
   // captured argument over at least the inlined function and till the end of a
@@ -142,21 +141,33 @@ static void fixupReferenceCounts(
       auto error =
           valueHasLinearLifetime(copy, {applySite}, {}, visitedBlocks,
                                  deadEndBlocks, errorBehavior, &leakingBlocks);
-      if (error.getFoundError()) {
+      if (error.getFoundLeak()) {
         while (!leakingBlocks.empty()) {
           auto *leakingBlock = leakingBlocks.pop_back_val();
           auto loc = RegularLocation::getAutoGeneratedLocation();
           SILBuilderWithScope builder(leakingBlock->begin());
+          if (hasOwnership) {
+            builder.createEndBorrow(loc, argument);
+          }
           builder.emitDestroyValueOperation(loc, copy);
         }
       }
 
-      insertAfterApply(applySite, [&](SILBasicBlock::iterator iter) {
-        if (hasOwnership) {
-          SILBuilderWithScope(iter).createEndBorrow(loc, argument);
-        }
-        SILBuilderWithScope(iter).emitDestroyValueOperation(loc, copy);
-      });
+      // If we found an over consume it means that our value is consumed within
+      // the loop. That means our leak code will have lifetime extended the
+      // value over the loop. So we should /not/ insert a destroy after the
+      // apply site. In contrast, if we do not have an over consume, we must
+      // have been compensating for uses in the top of a diamond and need to
+      // insert a destroy after the apply since the leak will just cover the
+      // other path.
+      if (!error.getFoundOverConsume()) {
+        insertAfterApply(applySite, [&](SILBasicBlock::iterator iter) {
+          if (hasOwnership) {
+            SILBuilderWithScope(iter).createEndBorrow(loc, argument);
+          }
+          SILBuilderWithScope(iter).emitDestroyValueOperation(loc, copy);
+        });
+      }
       v = argument;
       break;
     }

branches/tensorflow/lib/SILOptimizer/Mandatory/OSLogOptimization.cpp

@@ -390,7 +390,7 @@ static SILValue emitCodeForSymbolicValue(SymbolicValue symVal,
     return newStructInst;
   }
   default: {
-    llvm_unreachable("Symbolic value kind is not supported");
+    assert(false && "Symbolic value kind is not supported");
   }
   }
 }

branches/tensorflow/lib/SILOptimizer/Utils/ConstExpr.cpp

@@ -406,11 +406,6 @@ SymbolicValue ConstExprFunctionState::computeConstantValue(SILValue value) {
   if (auto *bai = dyn_cast<BeginAccessInst>(value))
     return getConstantValue(bai->getOperand());
 
-  // Look through copy_value and begin_borrow since the interpreter doesn't
-  // model these memory management instructions.
-  if (isa<CopyValueInst>(value) || isa<BeginBorrowInst>(value))
-    return getConstantValue(cast<SingleValueInstruction>(value)->getOperand(0));
-
   LLVM_DEBUG(llvm::dbgs() << "ConstExpr Unknown simple: " << *value << "\n");
 
   // Otherwise, we don't know how to handle this.
@@ -1297,8 +1292,7 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
       // skip them.
       isa<DestroyAddrInst>(inst) || isa<RetainValueInst>(inst) ||
       isa<ReleaseValueInst>(inst) || isa<StrongRetainInst>(inst) ||
-      isa<StrongReleaseInst>(inst) || isa<DestroyValueInst>(inst) ||
-      isa<EndBorrowInst>(inst))
+      isa<StrongReleaseInst>(inst))
     return None;
 
   // If this is a special flow-sensitive instruction like a stack allocation,
@@ -1308,15 +1302,6 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
     return None;
   }
 
-  // Make sure that our copy_value, begin_borrow form constants. Otherwise,
-  // return why.
-  if (isa<CopyValueInst>(inst) || isa<BeginBorrowInst>(inst)) {
-    auto result = getConstantValue(inst->getOperand(0));
-    if (!result.isConstant())
-      return result;
-    return None;
-  }
-
   // If this is a deallocation of a memory object that we are tracking, then
   // don't do anything.  The memory is allocated in a BumpPtrAllocator so there
   // is no useful way to free it.

branches/tensorflow/lib/Sema/MiscDiagnostics.cpp

@@ -64,8 +64,8 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
   class DiagnoseWalker : public ASTWalker {
     SmallPtrSet<Expr*, 4> AlreadyDiagnosedMetatypes;
     SmallPtrSet<DeclRefExpr*, 4> AlreadyDiagnosedBitCasts;
-
-    /// Keep track of acceptable DiscardAssignmentExpr's.
+    
+    // Keep track of acceptable DiscardAssignmentExpr's.
     SmallPtrSet<DiscardAssignmentExpr*, 2> CorrectDiscardAssignmentExprs;
 
     /// Keep track of the arguments to CallExprs.
@@ -245,42 +245,6 @@ static void diagSyntacticUseRestrictions(TypeChecker &TC, const Expr *E,
         }
       }
 
-      // Diagnose tuple expressions with duplicate element label
-      if (auto *tupleExpr = dyn_cast<TupleExpr>(E)) {
-        // FIXME: Duplicate labels on enum payloads should be diagnosed
-        // when declared, not when called.
-        bool isEnumCase = false;
-        if (auto CE = dyn_cast_or_null<CallExpr>(Parent.getAsExpr())) {
-          auto calledValue = CE->getCalledValue();
-          if (calledValue) {
-            isEnumCase = isa<EnumElementDecl>(calledValue);
-          }
-        }
-
-        if ((!CallArgs.count(tupleExpr)) || isEnumCase) {
-          auto diagnose = false;
-
-          llvm::SmallDenseSet<Identifier> names;
-          names.reserve(tupleExpr->getNumElements());
-
-          for (auto name : tupleExpr->getElementNames()) {
-            if (name.empty())
-              continue;
-
-            if (names.count(name) == 1) {
-              diagnose = true;
-              break;
-            }
-
-            names.insert(name);
-          }
-
-          if (diagnose) {
-            TC.diagnose(tupleExpr->getLoc(), diag::tuple_duplicate_label);
-          }
-        }
-      }
-
       return { true, E };
     }
 

branches/tensorflow/lib/Sema/TypeCheckPattern.cpp

@@ -313,7 +313,7 @@ class ResolvePattern : public ASTVisitor<ResolvePattern,
   Pattern *visitExprPattern(ExprPattern *P) {
     if (P->isResolved())
       return P;
-
+    
     // Try to convert to a pattern.
     Pattern *exprAsPattern = visit(P->getSubExpr());
     // If we failed, keep the ExprPattern as is.