---

yaml
---
r: 339707
b: refs/heads/rxwei-patch-1
c: d86907e
h: refs/heads/master
i:
  339705: 297a28f
  339703: 379d35d

Author: DougGregor

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 5fba88c78e9c14d6d555c9950556f976b543e0f1
+refs/heads/rxwei-patch-1: d86907e0954ac686631609a600ce7185afad07e1
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/include/swift/FrontendTool/FrontendTool.h

@@ -42,19 +42,6 @@ class FrontendObserver {
 
   /// The frontend has configured the compiler instance.
   virtual void configuredCompiler(CompilerInstance &instance);
-
-  /// The frontend has performed semantic analysis.
-  virtual void performedSemanticAnalysis(CompilerInstance &instance);
-
-  /// The frontend has performed basic SIL generation.
-  /// SIL diagnostic passes have not yet been applied.
-  virtual void performedSILGeneration(SILModule &module);
-
-  /// The frontend has executed the SIL optimization and diagnostics pipelines.
-  virtual void performedSILProcessing(SILModule &module);
-
-  // TODO: maybe enhance this interface to hear about IRGen and LLVM
-  // progress.
 };
 
 namespace frontend {

branches/rxwei-patch-1/include/swift/SIL/SILBasicBlock.h

@@ -232,20 +232,11 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
                                                const ValueDecl *D = nullptr);
 
   /// Replace the \p{i}th BB arg with a new BBArg with SILType \p Ty and
-  /// ValueDecl \p D.
-  ///
-  /// NOTE: This assumes that the current argument in position \p i has had its
-  /// uses eliminated. To replace/replace all uses with, use
-  /// replacePhiArgumentAndRAUW.
-  SILPhiArgument *replacePhiArgument(unsigned i, SILType type,
-                                     ValueOwnershipKind kind,
-                                     const ValueDecl *decl = nullptr);
-
-  /// Replace phi argument \p i and RAUW all uses.
-  SILPhiArgument *
-  replacePhiArgumentAndReplaceAllUses(unsigned i, SILType type,
-                                      ValueOwnershipKind kind,
-                                      const ValueDecl *decl = nullptr);
+  /// ValueDecl
+  /// \p D.
+  SILPhiArgument *replacePhiArgument(unsigned i, SILType Ty,
+                                     ValueOwnershipKind Kind,
+                                     const ValueDecl *D = nullptr);
 
   /// Allocate a new argument of type \p Ty and append it to the argument
   /// list. Optionally you can pass in a value decl parameter.

branches/rxwei-patch-1/include/swift/SIL/SILBuilder.h

@@ -1938,7 +1938,11 @@ class SILBuilder {
                           SILType destTy, SILBasicBlock *successBB,
                           SILBasicBlock *failureBB,
                           ProfileCounter Target1Count = ProfileCounter(),
-                          ProfileCounter Target2Count = ProfileCounter());
+                          ProfileCounter Target2Count = ProfileCounter()) {
+    return insertTerminator(CheckedCastBranchInst::create(
+        getSILDebugLocation(Loc), isExact, op, destTy, successBB, failureBB,
+        getFunction(), C.OpenedArchetypes, Target1Count, Target2Count));
+  }
 
   CheckedCastValueBranchInst *
   createCheckedCastValueBranch(SILLocation Loc, SILValue op, SILType destTy,

branches/rxwei-patch-1/include/swift/SIL/SILInstruction.h

@@ -1841,8 +1841,6 @@ class ApplyInstBase<Impl, Base, false> : public Base {
   /// issues. It is at the bottom of the file.
   SILFunction *getCalleeFunction() const;
 
-  bool isCalleeDynamicallyReplaceable() const;
-
   /// Gets the referenced function if the callee is a function_ref instruction.
   SILFunction *getReferencedFunction() const {
     if (auto *FRI = dyn_cast<FunctionRefBaseInst>(getCallee()))
@@ -7775,27 +7773,6 @@ SILValue ApplyInstBase<Impl, Base, false>::getCalleeOrigin() const {
   }
 }
 
-template <class Impl, class Base>
-bool ApplyInstBase<Impl, Base, false>::isCalleeDynamicallyReplaceable() const {
-  SILValue Callee = getCalleeOrigin();
-
-  while (true) {
-    if (auto *FRI = dyn_cast<FunctionRefInst>(Callee))
-      return false;
-
-    if (auto *FRI = dyn_cast<DynamicFunctionRefInst>(Callee))
-      return true;
-    if (auto *FRI = dyn_cast<PreviousDynamicFunctionRefInst>(Callee))
-      return true;
-
-    if (auto *PAI = dyn_cast<PartialApplyInst>(Callee)) {
-      Callee = PAI->getCalleeOrigin();
-      continue;
-    }
-    return false;
-  }
-}
-
 template <class Impl, class Base>
 SILFunction *ApplyInstBase<Impl, Base, false>::getCalleeFunction() const {
   SILValue Callee = getCalleeOrigin();

branches/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/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/rxwei-patch-1/lib/FrontendTool/FrontendTool.cpp

@@ -1005,9 +1005,6 @@ static bool performCompile(CompilerInstance &Instance,
   if (Action == FrontendOptions::ActionType::ResolveImports)
     return Context.hadError();
 
-  if (observer)
-    observer->performedSemanticAnalysis(Instance);
-
   if (Stats)
     countStatsPostSema(*Stats, Instance);
 
@@ -1241,9 +1238,6 @@ static bool performCompileStepsPostSILGen(
   if (auto *SF = MSF.dyn_cast<SourceFile *>())
     ricd.emplace(*SF);
 
-  if (observer)
-    observer->performedSILGeneration(*SM);
-
   if (Stats)
     countStatsPostSILGen(*Stats, *SM);
 
@@ -1290,9 +1284,6 @@ static bool performCompileStepsPostSILGen(
   if (Instance.performSILProcessing(SM.get(), Stats))
     return true;
 
-  if (observer)
-    observer->performedSILProcessing(*SM);
-
   emitAnyWholeModulePostTypeCheckSupplementaryOutputs(Instance, Invocation,
                                                       moduleIsPublic);
 
@@ -1856,6 +1847,3 @@ int swift::performFrontend(ArrayRef<const char *> Args,
 
 void FrontendObserver::parsedArgs(CompilerInvocation &invocation) {}
 void FrontendObserver::configuredCompiler(CompilerInstance &instance) {}
-void FrontendObserver::performedSemanticAnalysis(CompilerInstance &instance) {}
-void FrontendObserver::performedSILGeneration(SILModule &module) {}
-void FrontendObserver::performedSILProcessing(SILModule &module) {}

branches/rxwei-patch-1/lib/IDE/IDETypeChecking.cpp

@@ -39,9 +39,6 @@ static bool shouldPrintAsFavorable(const Decl *D, const PrintOptions &Options) {
   const auto *FD = dyn_cast<FuncDecl>(D);
   if (!FD)
     return true;
-  // Don't check overload choices for accessor decls.
-  if (isa<AccessorDecl>(FD))
-    return true;
   ResolvedMemberResult Result =
       resolveValueMember(*DC, BaseTy, FD->getEffectiveFullName());
   return !(Result.hasBestOverload() && Result.getBestOverload() != D);

branches/rxwei-patch-1/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/rxwei-patch-1/lib/IRGen/GenKeyPath.cpp

@@ -761,13 +761,8 @@ emitKeyPathComponent(IRGenModule &IGM,
       assert(currentBaseTy->getClassOrBoundGenericClass() == propertyBaseDecl);
       loweredBaseTy =
           IGM.getLoweredType(AbstractionPattern::getOpaque(), currentBaseTy);
-      
-      auto loweredBaseContextTy = SILType::getPrimitiveObjectType(
-            GenericEnvironment::mapTypeIntoContext(genericEnv,
-                                                   loweredBaseTy.getASTType())
-              ->getCanonicalType());
 
-      switch (getClassFieldAccess(IGM, loweredBaseContextTy, property)) {
+      switch (getClassFieldAccess(IGM, loweredBaseTy, property)) {
       case FieldAccess::ConstantDirect: {
         // Known constant fixed offset.
         auto offset = tryEmitConstantClassFragilePhysicalMemberOffset(IGM,

branches/rxwei-patch-1/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/rxwei-patch-1/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();