---

yaml
---
r: 349116
b: refs/heads/master
c: d6fe1e9
h: refs/heads/master

Author: CodaFi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ca19a9d12fe3e819cdc1c61f008f3a07daae0008
+refs/heads/master: d6fe1e9d39c99fb5dfc5411ab5c7e82344ecc180
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/CMakeLists.txt

@@ -377,10 +377,6 @@ option(SWIFT_ENABLE_STDLIBCORE_EXCLUSIVITY_CHECKING
   "Build stdlibCore with exclusivity checking enabled"
   FALSE)
 
-option(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING
-  "Enable experimental Swift differentiable programming features"
-  FALSE)
-
 #
 # End of user-configurable options.
 #

trunk/benchmark/single-source/UTF8Decode.swift

@@ -42,18 +42,6 @@ public let UTF8Decode = [
       name: "UTF8Decode_InitFromBytes_ascii",
       runFunction: run_UTF8Decode_InitFromBytes_ascii,
       tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitFromData_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitFromData_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitDecoding_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitDecoding_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
-    BenchmarkInfo(
-      name: "UTF8Decode_InitFromBytes_ascii_as_ascii",
-      runFunction: run_UTF8Decode_InitFromBytes_ascii_as_ascii,
-      tags: [.validation, .api, .String]),
 ]
 
 // 1-byte sequences
@@ -141,26 +129,4 @@ public func run_UTF8Decode_InitFromBytes_ascii(_ N: Int) {
   }
 }
 
-@inline(never)
-public func run_UTF8Decode_InitFromData_ascii_as_ascii(_ N: Int) {
-  let input = asciiData
-  for _ in 0..<1_000*N {
-    blackHole(String(data: input, encoding: .ascii))
-  }
-}
-@inline(never)
-public func run_UTF8Decode_InitDecoding_ascii_as_ascii(_ N: Int) {
-  let input = asciiBytes
-  for _ in 0..<1_000*N {
-    blackHole(String(decoding: input, as: Unicode.ASCII.self))
-  }
-}
-@inline(never)
-public func run_UTF8Decode_InitFromBytes_ascii_as_ascii(_ N: Int) {
-  let input = asciiBytes
-  for _ in 0..<1_000*N {
-    blackHole(String(bytes: input, encoding: .ascii))
-  }
-}
-
 

trunk/cmake/modules/AddSwift.cmake

@@ -422,10 +422,6 @@ function(_add_variant_swift_compile_flags
     list(APPEND result "-D" "SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS")
   endif()
 
-  if(SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING)
-    list(APPEND result "-D" "SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING")
-  endif()
-
   set("${result_var_name}" "${result}" PARENT_SCOPE)
 endfunction()
 

trunk/include/swift/SIL/SILConstants.h

@@ -33,7 +33,6 @@ struct DerivedAddressValue;
 struct EnumWithPayloadSymbolicValue;
 struct SymbolicValueMemoryObject;
 struct UnknownSymbolicValue;
-struct SymbolicClosure;
 
 extern llvm::cl::opt<unsigned> ConstExprLimit;
 
@@ -262,9 +261,6 @@ class SymbolicValue {
 
     /// This represents an array.
     RK_Array,
-
-    /// This represents a closure.
-    RK_Closure,
   };
 
   union {
@@ -309,7 +305,7 @@ class SymbolicValue {
     /// information about the memory object and access path of the access.
     DerivedAddressValue *derivedAddress;
 
-    // The following two fields are for representing an Array.
+    // The following fields are for representing an Array.
     //
     // In Swift, an array is a non-trivial struct that stores a reference to an
     // internal storage: _ContiguousArrayStorage. Though arrays have value
@@ -333,10 +329,6 @@ class SymbolicValue {
     /// When this symbolic value is of an "Array" kind, this stores a memory
     /// object that contains a SymbolicArrayStorage value.
     SymbolicValueMemoryObject *array;
-
-    /// When this symbolic value is of "Closure" kind, store a pointer to the
-    /// symbolic representation of the closure.
-    SymbolicClosure *closure;
   } value;
 
   RepresentationKind representationKind : 8;
@@ -392,9 +384,6 @@ class SymbolicValue {
     /// This represents an array value.
     Array,
 
-    /// This represents a closure.
-    Closure,
-
     /// These values are generally only seen internally to the system, external
     /// clients shouldn't have to deal with them.
     UninitMemory
@@ -544,22 +533,6 @@ class SymbolicValue {
   /// Return the type of this array symbolic value.
   Type getArrayType() const;
 
-  /// Create and return a symbolic value that represents a closure.
-  /// \param target SILFunction corresponding the target of the closure.
-  /// \param capturedArguments an array consisting of SILValues of captured
-  /// arguments along with their symbolic values when available.
-  /// \param allocator the allocator to use for storing the contents of this
-  /// symbolic value.
-  static SymbolicValue makeClosure(
-      SILFunction *target,
-      ArrayRef<std::pair<SILValue, Optional<SymbolicValue>>> capturedArguments,
-      SymbolicValueAllocator &allocator);
-
-  SymbolicClosure *getClosure() const {
-    assert(getKind() == Closure);
-    return value.closure;
-  }
-
   //===--------------------------------------------------------------------===//
   // Helpers
 
@@ -634,57 +607,6 @@ struct SymbolicValueMemoryObject {
   SymbolicValueMemoryObject(const SymbolicValueMemoryObject &) = delete;
   void operator=(const SymbolicValueMemoryObject &) = delete;
 };
-
-using SymbolicClosureArgument = std::pair<SILValue, Optional<SymbolicValue>>;
-
-/// Representation of a symbolic closure. A symbolic closure consists of a
-/// SILFunction and an array of SIL values, corresponding to the captured
-/// arguments, and (optional) symbolic values representing the constant values
-/// of the captured arguments. The symbolic values are optional as it is not
-/// necessary for every captured argument to be a constant, which enables
-/// representing closures whose captured arguments are not compile-time
-/// constants.
-struct SymbolicClosure final
-  : private llvm::TrailingObjects<SymbolicClosure, SymbolicClosureArgument> {
-
-  friend class llvm::TrailingObjects<SymbolicClosure, SymbolicClosureArgument>;
-
-private:
-
-  SILFunction *target;
-
-  // The number of SIL values captured by the closure.
-  unsigned numCaptures;
-
-  // True iff there exists captured arguments whose constant value is not known.
-  bool hasNonConstantCaptures = true;
-
-  SymbolicClosure() = delete;
-  SymbolicClosure(const SymbolicClosure &) = delete;
-  SymbolicClosure(SILFunction *callee, unsigned numArguments,
-                  bool nonConstantCaptures)
-      : target(callee), numCaptures(numArguments),
-        hasNonConstantCaptures(nonConstantCaptures) {}
-
-public:
-  static SymbolicClosure *create(SILFunction *callee,
-                                 ArrayRef<SymbolicClosureArgument> args,
-                                 SymbolicValueAllocator &allocator);
-
-  ArrayRef<SymbolicClosureArgument> getCaptures() const {
-    return {getTrailingObjects<SymbolicClosureArgument>(), numCaptures};
-  }
-
-  // This is used by the llvm::TrailingObjects base class.
-  size_t numTrailingObjects(OverloadToken<SymbolicClosureArgument>) const {
-    return numCaptures;
-  }
-
-  SILFunction *getTarget() {
-    return target;
-  }
-};
-
 } // end namespace swift
 
 #endif

trunk/lib/IRGen/GenEnum.cpp

@@ -1127,10 +1127,12 @@ namespace {
   protected:
     int64_t getDiscriminatorIndex(EnumElementDecl *target) const override {
       // The elements are assigned discriminators ABI-compatible with their
-      // raw values from C.
-      assert(target->getRawValueExpr()
-             && "c-compatible enum elt has no raw value?!");
-      auto intExpr = cast<IntegerLiteralExpr>(target->getRawValueExpr());
+      // raw values from C. An invalid raw value is assigned the error index -1.
+      auto intExpr =
+          dyn_cast_or_null<IntegerLiteralExpr>(target->getRawValueExpr());
+      if (!intExpr) {
+        return -1;
+      }
       auto intType = getDiscriminatorType();
 
       APInt intValue =

trunk/lib/SIL/SILConstants.cpp

@@ -126,29 +126,6 @@ void SymbolicValue::print(llvm::raw_ostream &os, unsigned indent) const {
   case RK_Array: {
     os << getArrayType() << ": \n";
     getStorageOfArray().print(os, indent);
-    return;
-  }
-  case RK_Closure: {
-    SymbolicClosure *clo = getClosure();
-    SILFunction *target = clo->getTarget();
-    std::string targetName = target->getName();
-    os << "closure: target: " << targetName;
-    ArrayRef<SymbolicClosureArgument> args = clo->getCaptures();
-    os << " captures [\n";
-    for (SymbolicClosureArgument closureArg : args) {
-      os.indent(indent + 2) << closureArg.first << "\n";
-    }
-    os.indent(indent) << "] values: [\n";
-    for (SymbolicClosureArgument closureArg : args) {
-      Optional<SymbolicValue> value = closureArg.second;
-      if (!value.hasValue()) {
-        os.indent(indent + 2) << "nil\n";
-        continue;
-      }
-      value->print(os, indent + 2);
-    }
-    os.indent(indent) << "]\n";
-    return;
   }
   }
 }
@@ -185,8 +162,6 @@ SymbolicValue::Kind SymbolicValue::getKind() const {
     return ArrayStorage;
   case RK_Array:
     return Array;
-  case RK_Closure:
-    return Closure;
   }
   llvm_unreachable("covered switch");
 }
@@ -244,11 +219,6 @@ SymbolicValue::cloneInto(SymbolicValueAllocator &allocator) const {
     SymbolicValue clonedStorage = getStorageOfArray().cloneInto(allocator);
     return getArray(getArrayType(), clonedStorage, allocator);
   }
-  case RK_Closure: {
-    SymbolicClosure *clo = getClosure();
-    ArrayRef<SymbolicClosureArgument> closureArgs = clo->getCaptures();
-    return SymbolicValue::makeClosure(clo->getTarget(), closureArgs, allocator);
-  }
   }
   llvm_unreachable("covered switch");
 }
@@ -691,44 +661,6 @@ Type SymbolicValue::getArrayType() const {
   return value.array->getType();
 }
 
-//===----------------------------------------------------------------------===//
-// Symbolic Closure
-//===----------------------------------------------------------------------===//
-
-SymbolicValue SymbolicValue::makeClosure(SILFunction *target,
-                                         ArrayRef<SymbolicClosureArgument> args,
-                                         SymbolicValueAllocator &allocator) {
-  auto clo = SymbolicClosure::create(target, args, allocator);
-  SymbolicValue result;
-  result.representationKind = RK_Closure;
-  result.value.closure = clo;
-  return result;
-}
-
-SymbolicClosure *SymbolicClosure::create(SILFunction *target,
-                                         ArrayRef<SymbolicClosureArgument> args,
-                                         SymbolicValueAllocator &allocator) {
-  // Determine whether there are captured arguments without a symbolic value.
-  bool hasNonConstantCapture = false;
-  for (SymbolicClosureArgument closureArg : args) {
-    if (!closureArg.second) {
-      hasNonConstantCapture = true;
-      break;
-    }
-  }
-
-  auto byteSizeOfArgs =
-      SymbolicClosure::totalSizeToAlloc<SymbolicClosureArgument>(args.size());
-  auto rawMem = allocator.allocate(byteSizeOfArgs, alignof(SymbolicClosure));
-  //  Placement initialize the object.
-  auto closure = ::new (rawMem)
-      SymbolicClosure(target, args.size(), hasNonConstantCapture);
-  std::uninitialized_copy(
-      args.begin(), args.end(),
-      closure->getTrailingObjects<SymbolicClosureArgument>());
-  return closure;
-}
-
 //===----------------------------------------------------------------------===//
 // Higher level code
 //===----------------------------------------------------------------------===//

trunk/lib/SILOptimizer/Utils/ConstExpr.cpp

@@ -1630,36 +1630,6 @@ ConstExprFunctionState::evaluateFlowSensitive(SILInstruction *inst) {
                           injectEnumInst->getOperand());
   }
 
-  if (auto *papply = dyn_cast<PartialApplyInst>(inst)) {
-    SILValue calleeOperand = papply->getOperand(0);
-    SymbolicValue calleeValue = getConstantValue(calleeOperand);
-    if (!calleeValue.isConstant())
-      return calleeValue;
-    if (calleeValue.getKind() != SymbolicValue::Function) {
-      return getUnknown(evaluator, (SILInstruction *)papply,
-                        UnknownReason::InvalidOperandValue);
-    }
-
-    SILFunction *target = calleeValue.getFunctionValue();
-    assert(target != nullptr);
-
-    // Arguments to this partial-apply instruction are the captures of the
-    // closure.
-    SmallVector<SymbolicClosureArgument, 4> captures;
-    for (SILValue argument : papply->getArguments()) {
-      SymbolicValue argumentValue = getConstantValue(argument);
-      if (!argumentValue.isConstant()) {
-        captures.push_back({ argument, None });
-        continue;
-      }
-      captures.push_back({ argument, argumentValue });
-    }
-    auto closureVal = SymbolicValue::makeClosure(target, captures,
-                                                 evaluator.getAllocator());
-    setValue(papply, closureVal);
-    return None;
-  }
-
   // If the instruction produces a result, try computing it, and fail if the
   // computation fails.
   if (auto *singleValueInst = dyn_cast<SingleValueInstruction>(inst)) {
@@ -1964,8 +1934,6 @@ ConstExprStepEvaluator::skipByMakingEffectsNonConstant(
            constKind == SymbolicValue::Aggregate ||
            constKind == SymbolicValue::Enum ||
            constKind == SymbolicValue::EnumWithPayload ||
-           constKind == SymbolicValue::Array ||
-           constKind == SymbolicValue::Closure ||
            constKind == SymbolicValue::UninitMemory);
 
     if (constKind != SymbolicValue::Address) {

trunk/lib/Sema/CSSimplify.cpp

@@ -20,7 +20,6 @@
 #include "swift/AST/ExistentialLayout.h"
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/GenericSignature.h"
-#include "swift/AST/Initializer.h"
 #include "swift/AST/ParameterList.h"
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
@@ -4865,19 +4864,7 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
   // reasonable choice.
   auto addChoice = [&](OverloadChoice candidate) {
     auto decl = candidate.getDecl();
-
-    // In a pattern binding initializer, immediately reject all of its bound
-    // variables. These would otherwise allow circular references.
-    if (auto *PBI = dyn_cast<PatternBindingInitializer>(DC)) {
-      if (auto *VD = dyn_cast<VarDecl>(decl)) {
-        if (PBI->getBinding() == VD->getParentPatternBinding()) {
-          result.addUnviable(candidate,
-                             MemberLookupResult::UR_InstanceMemberOnType);
-          return;
-        }
-      }
-    }
-
+    
     // If the result is invalid, skip it.
     // FIXME(InterfaceTypeRequest): isInvalid() should be based on the interface type.
     (void)decl->getInterfaceType();