---

yaml
---
r: 314871
b: refs/heads/master
c: e066ab3
h: refs/heads/master
i:
  314869: 09ba317
  314867: a049a9f
  314863: de2ffdc

Author: nkcsgexi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c7978fa4778587643a8b4af0b2a527695d620097
+refs/heads/master: e066ab335a6282fb5256e18ce62d778317194642
 refs/heads/master-next: 66a7e661ff8e88e2d4efab3e430197a7a941e352
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Serialization/ModuleFile.h

@@ -87,46 +87,11 @@ class ModuleFile
   /// A callback to be invoked every time a type was deserialized.
   std::function<void(Type)> DeserializedTypeCallback;
 
-  /// The number of entities that are currently being deserialized.
-  unsigned NumCurrentDeserializingEntities = 0;
-
   /// Is this module file actually a .sib file? .sib files are serialized SIL at
   /// arbitrary granularity and arbitrary stage; unlike serialized Swift
   /// modules, which are assumed to contain canonical SIL for an entire module.
   bool IsSIB = false;
 
-  /// RAII class to be used when deserializing an entity.
-  class DeserializingEntityRAII {
-    ModuleFile &MF;
-
-  public:
-    DeserializingEntityRAII(ModuleFile &mf)
-        : MF(mf.getModuleFileForDelayedActions()) {
-      ++MF.NumCurrentDeserializingEntities;
-    }
-    ~DeserializingEntityRAII() {
-      assert(MF.NumCurrentDeserializingEntities > 0 &&
-             "Imbalanced currently-deserializing count?");
-      if (MF.NumCurrentDeserializingEntities == 1) {
-        MF.finishPendingActions();
-      }
-
-      --MF.NumCurrentDeserializingEntities;
-    }
-  };
-  friend class DeserializingEntityRAII;
-
-  /// Picks a specific ModuleFile instance to serve as the "delayer" for the
-  /// entire module.
-  ///
-  /// This is usually \c this, but when there are partial swiftmodules all
-  /// loaded for the same module it may be different.
-  ModuleFile &getModuleFileForDelayedActions();
-
-  /// Finish any pending actions that were waiting for the topmost entity to
-  /// be deserialized.
-  void finishPendingActions();
-
 public:
   /// Represents another module that has been imported as a dependency.
   class Dependency {

trunk/lib/AST/ASTVerifier.cpp

@@ -2362,14 +2362,6 @@ class Verifier : public ASTWalker {
         }
       }
 
-      if (VD->isFinal() != VD->getAttrs().hasAttribute<FinalAttr>()) {
-        Out << "decl should be final iff it has FinalAttr, but isFinal() = "
-            << VD->isFinal() << " and hasAttribute<FinalAttr>() = "
-            << VD->getAttrs().hasAttribute<FinalAttr>() << "\n";
-        VD->dump(Out);
-        abort();
-      }
-
       verifyCheckedBase(VD);
     }
 

trunk/lib/SIL/LinearLifetimeChecker.cpp

@@ -42,8 +42,14 @@ namespace {
 using BrPropUserAndBlockPair = std::pair<BranchPropagatedUser, SILBasicBlock *>;
 
 struct State {
-  /// The value that we are checking.
-  SILValue value;
+  /// If we are checking for a specific value, this is that value. This is only
+  /// used for diagnostic purposes. The algorithm if this is set works on the
+  /// parent block of the value.
+  Optional<SILValue> value;
+
+  /// The block where the live range begins. If the field value is not None,
+  /// then this is value->getParentBlock();
+  SILBasicBlock *beginBlock;
 
   /// The result error object that use to signal either that no errors were
   /// found or if errors are found the specific type of error that was found.
@@ -75,8 +81,15 @@ struct State {
   State(SILValue value, SmallPtrSetImpl<SILBasicBlock *> &visitedBlocks,
         ErrorBehaviorKind errorBehavior,
         SmallVectorImpl<SILBasicBlock *> *leakingBlocks)
-      : value(value), error(errorBehavior), visitedBlocks(visitedBlocks),
-        leakingBlocks(leakingBlocks) {}
+      : value(value), beginBlock(value->getParentBlock()), error(errorBehavior),
+        visitedBlocks(visitedBlocks), leakingBlocks(leakingBlocks) {}
+
+  State(SILBasicBlock *beginBlock,
+        SmallPtrSetImpl<SILBasicBlock *> &visitedBlocks,
+        ErrorBehaviorKind errorBehavior,
+        SmallVectorImpl<SILBasicBlock *> *leakingBlocks)
+      : value(), beginBlock(beginBlock), error(errorBehavior),
+        visitedBlocks(visitedBlocks), leakingBlocks(leakingBlocks) {}
 
   void initializeAllNonConsumingUses(
       ArrayRef<BranchPropagatedUser> nonConsumingUsers);
@@ -183,7 +196,7 @@ void State::initializeAllConsumingUses(
     // If this user is in the same block as the value, do not visit
     // predecessors. We must be extra tolerant here since we allow for
     // unreachable code.
-    if (userBlock == value->getParentBlock())
+    if (userBlock == beginBlock)
       continue;
 
     // Then for each predecessor of this block...
@@ -203,10 +216,15 @@ void State::initializeConsumingUse(BranchPropagatedUser consumingUser,
     return;
 
   error.handleOverConsume([&] {
-    llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
-                 << "Found over consume?!\n"
-                 << "Value: " << *value << "User: " << *consumingUser
-                 << "Block: bb" << userBlock->getDebugID() << "\n\n";
+    llvm::errs() << "Function: '" << beginBlock->getParent()->getName() << "'\n"
+                 << "Found over consume?!\n";
+    if (auto v = value) {
+      llvm::errs() << "Value: " << *value;
+    } else {
+      llvm::errs() << "Value: N/A\n";
+    }
+    llvm::errs() << "User: " << *consumingUser << "Block: bb"
+                 << userBlock->getDebugID() << "\n\n";
   });
 }
 
@@ -228,10 +246,16 @@ void State::checkForSameBlockUseAfterFree(BranchPropagatedUser consumingUser,
   // the cond branch user is in a previous block. So just bail early.
   if (consumingUser.isCondBranchUser()) {
     error.handleUseAfterFree([&]() {
-      llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+      llvm::errs() << "Function: '" << beginBlock->getParent()->getName()
+                   << "'\n"
                    << "Found use after free?!\n"
-                   << "Value: " << *value
-                   << "Consuming User: " << *consumingUser
+                   << "Value: ";
+      if (auto v = value) {
+        llvm::errs() << *v;
+      } else {
+        llvm::errs() << "N/A. \n";
+      }
+      llvm::errs() << "Consuming User: " << *consumingUser
                    << "Non Consuming User: " << *iter->second << "Block: bb"
                    << userBlock->getDebugID() << "\n\n";
     });
@@ -255,10 +279,16 @@ void State::checkForSameBlockUseAfterFree(BranchPropagatedUser consumingUser,
                      return nonConsumingUser == &i;
                    }) != userBlock->end()) {
     error.handleUseAfterFree([&] {
-      llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+      llvm::errs() << "Function: '" << beginBlock->getParent()->getName()
+                   << "'\n"
                    << "Found use after free?!\n"
-                   << "Value: " << *value
-                   << "Consuming User: " << *consumingUser
+                   << "Value: ";
+      if (auto v = value) {
+        llvm::errs() << *v;
+      } else {
+        llvm::errs() << "N/A. \n";
+      }
+      llvm::errs() << "Consuming User: " << *consumingUser
                    << "Non Consuming User: " << *iter->second << "Block: bb"
                    << userBlock->getDebugID() << "\n\n";
     });
@@ -287,10 +317,17 @@ void State::checkPredsForDoubleConsume(BranchPropagatedUser consumingUser,
   }
 
   error.handleOverConsume([&] {
-    llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+    llvm::errs() << "Function: '" << beginBlock->getParent()->getName() << "'\n"
                  << "Found over consume?!\n"
-                 << "Value: " << *value << "User: " << *consumingUser
-                 << "Block: bb" << userBlock->getDebugID() << "\n\n";
+                 << "Value: ";
+    if (auto v = value) {
+      llvm::errs() << *v;
+    } else {
+      llvm::errs() << "N/A. \n";
+    }
+
+    llvm::errs() << "User: " << *consumingUser << "Block: bb"
+                 << userBlock->getDebugID() << "\n\n";
   });
 }
 
@@ -310,10 +347,16 @@ void State::checkPredsForDoubleConsume(SILBasicBlock *userBlock) {
   }
 
   error.handleOverConsume([&] {
-    llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+    llvm::errs() << "Function: '" << beginBlock->getParent()->getName() << "'\n"
                  << "Found over consume?!\n"
-                 << "Value: " << *value << "Block: bb"
-                 << userBlock->getDebugID() << "\n\n";
+                 << "Value: ";
+    if (auto v = value) {
+      llvm::errs() << *v;
+    } else {
+      llvm::errs() << "N/A. \n";
+    }
+
+    llvm::errs() << "Block: bb" << userBlock->getDebugID() << "\n\n";
   });
 }
 
@@ -370,7 +413,7 @@ void State::performDataflow(DeadEndBlocks &deBlocks) {
     // further to do since we do not want to visit the predecessors of our
     // dominating block. On the other hand, we do want to add its successors to
     // the successorBlocksThatMustBeVisited set.
-    if (block == value->getParentBlock())
+    if (block == beginBlock)
       continue;
 
     // Then for each predecessor of this block:
@@ -405,11 +448,16 @@ void State::checkDataflowEndState(DeadEndBlocks &deBlocks) {
 
     // If we are supposed to error on leaks, do so now.
     error.handleLeak([&] {
-      llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+      llvm::errs() << "Function: '" << beginBlock->getParent()->getName()
+                   << "'\n"
                    << "Error! Found a leak due to a consuming post-dominance "
-                      "failure!\n"
-                   << "    Value: " << *value
-                   << "    Post Dominating Failure Blocks:\n";
+                      "failure!\n";
+      if (auto v = value) {
+        llvm::errs() << "Value: " << *value;
+      } else {
+        llvm::errs() << "Value: N/A\n";
+      }
+      llvm::errs() << "    Post Dominating Failure Blocks:\n";
       for (auto *succBlock : successorBlocksThatMustBeVisited) {
         llvm::errs() << "        bb" << succBlock->getDebugID();
       }
@@ -434,10 +482,18 @@ void State::checkDataflowEndState(DeadEndBlocks &deBlocks) {
     }
 
     error.handleUseAfterFree([&] {
-      llvm::errs() << "Function: '" << value->getFunction()->getName() << "'\n"
+      llvm::errs() << "Function: '" << beginBlock->getParent()->getName()
+                   << "'\n"
                    << "Found use after free due to unvisited non lifetime "
                       "ending uses?!\n"
-                   << "Value: " << *value << "    Remaining Users:\n";
+                   << "Value: ";
+      if (auto v = value) {
+        llvm::errs() << *v;
+      } else {
+        llvm::errs() << "N/A. \n";
+      }
+
+      llvm::errs() << "    Remaining Users:\n";
       for (auto &pair : blocksWithNonConsumingUses) {
         llvm::errs() << "User:" << *pair.second << "Block: bb"
                      << pair.first->getDebugID() << "\n";

trunk/lib/Sema/CSDiag.cpp

@@ -1683,43 +1683,6 @@ bool FailureDiagnosis::diagnoseContextualConversionError(
   if (isUnresolvedOrTypeVarType(exprType) || exprType->isEqual(contextualType))
     return false;
 
-  // If this is conversion failure due to a return statement with an argument
-  // that cannot be coerced to the result type of the function, emit a
-  // specific error.
-  if (CTP == CTP_ThrowStmt) {
-    // If we tried to throw the error code of an error type, suggest object
-    // construction.
-    auto &TC = CS.getTypeChecker();
-    if (auto errorCodeProtocol =
-            TC.Context.getProtocol(KnownProtocolKind::ErrorCodeProtocol)) {
-      if (auto conformance = TypeChecker::conformsToProtocol(
-              CS.getType(expr), errorCodeProtocol, CS.DC,
-              ConformanceCheckFlags::InExpression)) {
-        Type errorCodeType = CS.getType(expr);
-        Type errorType =
-            conformance
-                ->getTypeWitnessByName(errorCodeType, TC.Context.Id_ErrorType)
-                ->getCanonicalType();
-        if (errorType) {
-          auto diag = diagnose(expr->getLoc(), diag::cannot_throw_error_code,
-                               errorCodeType, errorType);
-          if (auto unresolvedDot = dyn_cast<UnresolvedDotExpr>(expr)) {
-            diag.fixItInsert(unresolvedDot->getDotLoc(), "(");
-            diag.fixItInsertAfter(unresolvedDot->getEndLoc(), ")");
-          }
-          return true;
-        }
-      }
-    }
-
-    // The conversion destination of throw is always ErrorType (at the moment)
-    // if this ever expands, this should be a specific form like () is for
-    // return.
-    diagnose(expr->getLoc(), diag::cannot_convert_thrown_type, exprType)
-        .highlight(expr->getSourceRange());
-    return true;
-  }
-
   if (CTP == CTP_YieldByReference) {
     if (auto contextualLV = contextualType->getAs<LValueType>())
       contextualType = contextualLV->getObjectType();

trunk/lib/Sema/CSDiagnostics.cpp

@@ -1882,6 +1882,9 @@ bool ContextualFailure::diagnoseAsError() {
     if (diagnoseConversionToBool())
       return true;
 
+    if (diagnoseThrowsTypeMismatch())
+      return true;
+
     auto contextualType = getToType();
     if (auto msg = getDiagnosticFor(CTP, contextualType->isExistentialType())) {
       diagnostic = *msg;
@@ -2191,6 +2194,50 @@ bool ContextualFailure::diagnoseConversionToDictionary() const {
   return true;
 }
 
+bool ContextualFailure::diagnoseThrowsTypeMismatch() const {
+  // If this is conversion failure due to a return statement with an argument
+  // that cannot be coerced to the result type of the function, emit a
+  // specific error.
+  if (CTP != CTP_ThrowStmt)
+    return false;
+
+  auto *anchor = getAnchor();
+
+  // If we tried to throw the error code of an error type, suggest object
+  // construction.
+  auto &TC = getTypeChecker();
+  if (auto errorCodeProtocol =
+          TC.Context.getProtocol(KnownProtocolKind::ErrorCodeProtocol)) {
+    Type errorCodeType = getFromType();
+    if (auto conformance = TypeChecker::conformsToProtocol(
+            errorCodeType, errorCodeProtocol, getDC(),
+            ConformanceCheckFlags::InExpression)) {
+      Type errorType = conformance
+                           ->getTypeWitnessByName(errorCodeType,
+                                                  getASTContext().Id_ErrorType)
+                           ->getCanonicalType();
+      if (errorType) {
+        auto diagnostic =
+            emitDiagnostic(anchor->getLoc(), diag::cannot_throw_error_code,
+                           errorCodeType, errorType);
+        if (auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor)) {
+          diagnostic.fixItInsert(UDE->getDotLoc(), "(");
+          diagnostic.fixItInsertAfter(UDE->getEndLoc(), ")");
+        }
+        return true;
+      }
+    }
+  }
+
+  // The conversion destination of throw is always ErrorType (at the moment)
+  // if this ever expands, this should be a specific form like () is for
+  // return.
+  emitDiagnostic(anchor->getLoc(), diag::cannot_convert_thrown_type,
+                 getFromType())
+      .highlight(anchor->getSourceRange());
+  return true;
+}
+
 bool ContextualFailure::tryRawRepresentableFixIts(
     InFlightDiagnostic &diagnostic,
     KnownProtocolKind rawRepresentableProtocol) const {

trunk/lib/Sema/CSDiagnostics.h

@@ -629,6 +629,10 @@ class ContextualFailure : public FailureDiagnostic {
   /// or convert an array literal to a dictionary e.g. `let _: [String: Int] = ["A", 0]`
   bool diagnoseConversionToDictionary() const;
 
+  /// Produce a specialized diagnostic if this is an attempt to throw
+  /// something with doesn't conform to `Error`.
+  bool diagnoseThrowsTypeMismatch() const;
+
   /// Attempt to attach any relevant fix-its to already produced diagnostic.
   void tryFixIts(InFlightDiagnostic &diagnostic) const;