---

yaml
---
r: 294751
b: refs/heads/tensorflow
c: d3a192f
h: refs/heads/master
i:
  294749: 38345f5
  294747: 6be99cf
  294743: 9aa014e
  294735: b62db52
  294719: 4decc18

Author: nkcsgexi

[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: 6a204b7ddad6b19176f95bd32f654cf9d3144f69
+refs/heads/tensorflow: d3a192f3c532f69af0a064fb780f771d3ee9b5bd
 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/docs/SIL.rst

@@ -3053,73 +3053,6 @@ function_ref
 
 Creates a reference to a SIL function.
 
-dynamic_function_ref
-````````````
-::
-
-  sil-instruction ::= 'dynamic_function_ref' sil-function-name ':' sil-type
-
-  %1 = dynamic_function_ref @function : $@convention(thin) T -> U
-  // $@convention(thin) T -> U must be a thin function type
-  // %1 has type $T -> U
-
-Creates a reference to a `dynamically_replacable` SIL function. A
-`dynamically_replacable` SIL function can be replaced at runtime.
-
-For the following Swift code::
-
-  dynamic func test_dynamically_replaceable() {}
-
-  func test_dynamic_call() {
-    test_dynamically_replaceable()
-  }
-
-We will generate::
-
-  sil [dynamically_replacable] @test_dynamically_replaceable : $@convention(thin) () -> () {
-  bb0:
-    %0 = tuple ()
-    return %0 : $()
-  }
-
-  sil @test_dynamic_call : $@convention(thin) () -> () {
-  bb0:
-    %0 = dynamic_function_ref @test_dynamically_replaceable : $@convention(thin) () -> ()
-    %1 = apply %0() : $@convention(thin) () -> ()
-    %2 = tuple ()
-    return %2 : $()
-  }
-
-prev_dynamic_function_ref
-````````````
-::
-
-  sil-instruction ::= 'prev_dynamic_function_ref' sil-function-name ':' sil-type
-
-  %1 = prev_dynamic_function_ref @function : $@convention(thin) T -> U
-  // $@convention(thin) T -> U must be a thin function type
-  // %1 has type $T -> U
-
-Creates a reference to a previous implemenation of a `dynamic_replacement` SIL
-function.
-
-For the following Swift code::
-
-  @_dynamicReplacement(for: test_dynamically_replaceable())
-  func test_replacement() {
-    test_dynamically_replaceable() // calls previous implementation
-  }
-
-We  will generate::
-
-  sil [dynamic_replacement_for "test_dynamically_replaceable"] @test_replacement : $@convention(thin) () -> () {
-  bb0:
-    %0 = prev_dynamic_function_ref @test_replacement : $@convention(thin) () -> ()
-    %1 = apply %0() : $@convention(thin) () -> ()
-    %2 = tuple ()
-    return %2 : $()
-  }
-
 global_addr
 ```````````
 

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

@@ -731,8 +731,6 @@ ERROR(expected_type_after_arrow,none,
 ERROR(function_type_argument_label,none,
       "function types cannot have argument labels; use '_' before %0",
       (Identifier))
-ERROR(expected_dynamic_func_attr,none,
-      "expected a dynamically_replaceable function", ())
 
 // Enum Types
 ERROR(expected_expr_enum_case_raw_value,PointsToFirstBadToken,

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

@@ -3953,9 +3953,17 @@ ERROR(borrowed_on_objc_protocol_requirement,none,
 // MARK: dynamic
 //------------------------------------------------------------------------------
 
+ERROR(dynamic_not_in_class,none,
+      "only members of classes may be dynamic", ())
+ERROR(dynamic_with_nonobjc,none,
+      "a declaration cannot be both '@nonobjc' and 'dynamic'",
+      ())
 ERROR(dynamic_with_transparent,none,
       "a declaration cannot be both '@_tranparent' and 'dynamic'",
       ())
+ERROR(dynamic_requires_objc,none,
+      "'dynamic' %0 %1 must also be '@objc'",
+      (DescriptiveDeclKind, DeclName))
 
 //------------------------------------------------------------------------------
 // MARK: @_dynamicReplacement(for:)

branches/tensorflow/include/swift/Basic/ClusteredBitVector.h

@@ -539,6 +539,48 @@ class ClusteredBitVector {
     return !any();
   }
 
+  /// A class for scanning for set bits, from low indices to high ones.
+  class SetBitEnumerator {
+    ChunkType CurChunk;
+    const ChunkType *Chunks;
+    unsigned CurChunkIndex;
+    unsigned NumChunks;
+  public:
+    explicit SetBitEnumerator(const ClusteredBitVector &vector) {
+      if (vector.isInlineAndAllClear()) {
+        CurChunkIndex = 0;
+        NumChunks = 0;
+      } else {
+        Chunks = vector.getChunksPtr();
+        CurChunk = Chunks[0];
+        CurChunkIndex = 0;
+        NumChunks = vector.getLengthInChunks();
+      }
+    }
+
+    /// Search for another bit.  Returns false if it can't find one.
+    Optional<size_t> findNext() {
+      if (CurChunkIndex == NumChunks) return None;
+      auto cur = CurChunk;
+      while (!cur) {
+        if (++CurChunkIndex == NumChunks) return None;
+        cur = Chunks[CurChunkIndex];
+      }
+
+      // Find the index of the lowest set bit.
+      size_t bitIndex = llvm::countTrailingZeros(cur, llvm::ZB_Undefined);
+
+      // Clear that bit in the current chunk.
+      CurChunk = cur ^ (ChunkType(1) << bitIndex);
+      assert(!(CurChunk & (ChunkType(1) << bitIndex)));
+
+      return (CurChunkIndex * ChunkSizeInBits + bitIndex);
+    }
+  };
+  SetBitEnumerator enumerateSetBits() const {
+    return SetBitEnumerator(*this);
+  }
+
   friend bool operator==(const ClusteredBitVector &lhs,
                          const ClusteredBitVector &rhs) {
     if (lhs.size() != rhs.size())

branches/tensorflow/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/tensorflow/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/tensorflow/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/tensorflow/include/swift/SIL/SILFunction.h

@@ -590,6 +590,7 @@ class SILFunction
     return IsDynamicallyReplaceable_t(IsDynamicReplaceable);
   }
   void setIsDynamic(IsDynamicallyReplaceable_t value = IsDynamic) {
+    assert(IsDynamicReplaceable == IsNotDynamic && "already set");
     IsDynamicReplaceable = value;
     assert(!Transparent || !IsDynamicReplaceable);
   }

branches/tensorflow/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/tensorflow/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) {}