---

yaml
---
r: 335741
b: refs/heads/rxwei-patch-1
c: 445d426
h: refs/heads/master
i:
  335739: 902957e

Author: rintaro

[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: b616f6c0a4fb5f3d3b2035782215a0d205176904
+refs/heads/rxwei-patch-1: 445d426b16011faa9c17fe69ee054ddec4053f9d
 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/include/swift/SIL/SILInstruction.h

@@ -4186,17 +4186,9 @@ class ConvertEscapeToNoEscapeInst final
          SILFunction &F, SILOpenedArchetypesState &OpenedArchetypes,
          bool lifetimeGuaranteed);
 public:
-  /// Return true if we have extended the lifetime of the argument of the
-  /// convert_escape_to_no_escape to be over all uses of the trivial type.
   bool isLifetimeGuaranteed() const {
     return lifetimeGuaranteed;
   }
-
-  /// Mark that we have extended the lifetime of the argument of the
-  /// convert_escape_to_no_escape to be over all uses of the trivial type.
-  ///
-  /// NOTE: This is a one way operation.
-  void setLifetimeGuaranteed() { lifetimeGuaranteed = true; }
 };
 
 /// ThinFunctionToPointerInst - Convert a thin function pointer to a

branches/rxwei-patch-1/lib/SILOptimizer/Mandatory/ClosureLifetimeFixup.cpp

@@ -123,7 +123,12 @@ static void extendLifetimeToEndOfFunction(SILFunction &Fn,
   auto OptionalEscapingClosureTy = SILType::getOptionalType(EscapingClosureTy);
   auto loc = RegularLocation::getAutoGeneratedLocation();
 
-  Cvt->setLifetimeGuaranteed();
+  SILBuilderWithScope B(Cvt);
+  auto NewCvt = B.createConvertEscapeToNoEscape(
+      Cvt->getLoc(), Cvt->getOperand(), Cvt->getType(), true);
+  Cvt->replaceAllUsesWith(NewCvt);
+  Cvt->eraseFromParent();
+  Cvt = NewCvt;
 
   // If our Cvt is in the initial block, we do not need to use the SSA updater
   // since we know Cvt can not be in a loop and must dominate all exits
@@ -412,7 +417,14 @@ static bool tryExtendLifetimeToLastUse(
     // Insert a copy at the convert_escape_to_noescape [not_guaranteed] and
     // change the instruction to the guaranteed form.
     auto EscapingClosure = Cvt->getOperand();
-    Cvt->setLifetimeGuaranteed();
+    {
+      SILBuilderWithScope B(Cvt);
+      auto NewCvt = B.createConvertEscapeToNoEscape(
+          Cvt->getLoc(), Cvt->getOperand(), Cvt->getType(), true);
+      Cvt->replaceAllUsesWith(NewCvt);
+      Cvt->eraseFromParent();
+      Cvt = NewCvt;
+    }
 
     SILBuilderWithScope B2(Cvt);
     auto ClosureCopy = B2.createCopyValue(loc, EscapingClosure);
@@ -498,7 +510,14 @@ static bool trySwitchEnumPeephole(ConvertEscapeToNoEscapeInst *Cvt) {
   if (!onlyDestroy)
     return false;
 
-  Cvt->setLifetimeGuaranteed();
+  // Replace the convert_escape_to_noescape instruction.
+  {
+    SILBuilderWithScope B(Cvt);
+    auto NewCvt = B.createConvertEscapeToNoEscape(
+        Cvt->getLoc(), Cvt->getOperand(), Cvt->getType(), true);
+    Cvt->replaceAllUsesWith(NewCvt);
+    Cvt->eraseFromParent();
+  }
 
   // Extend the lifetime.
   SILBuilderWithScope B(SwitchEnum1);

branches/rxwei-patch-1/lib/Sema/CSSimplify.cpp

@@ -132,11 +132,8 @@ bool constraints::areConservativelyCompatibleArgumentLabels(
     hasCurriedSelf = false;
   } else if (baseType->is<AnyMetatypeType>() && decl->isInstanceMember()) {
     hasCurriedSelf = false;
-  } else if (auto *EED = dyn_cast<EnumElementDecl>(decl)) {
-    // enum elements have either `(Self.Type) -> (Arg...) -> Self`, or
-    // `(Self.Type) -> Self`, in the former case self type has to be
-    // stripped off.
-    hasCurriedSelf = bool(EED->getParameterList());
+  } else if (isa<EnumElementDecl>(decl)) {
+    hasCurriedSelf = false;
   } else {
     hasCurriedSelf = true;
   }

branches/rxwei-patch-1/test/ClangImporter/MixedSource/autolinking.swift

@@ -2,7 +2,10 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: autolink-extract
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnueabihf
+// UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 // Use a type declared in the Clang part of the module.
 public let y = Test()

branches/rxwei-patch-1/test/ClangImporter/autolinking.swift

@@ -14,7 +14,10 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: autolink-extract
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnueabihf
+// UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 import LinkMusket
 import LinkFramework

branches/rxwei-patch-1/test/Constraints/enum_cases.swift

@@ -124,34 +124,3 @@ func rdar34583132() {
     }
   }
 }
-
-func rdar_49159472() {
-  struct A {}
-  struct B {}
-  struct C {}
-
-  enum E {
-  case foo(a: A, b: B?)
-
-    var foo: C? {
-      return nil
-    }
-  }
-
-  class Test {
-    var e: E
-
-    init(_ e: E) {
-      self.e = e
-    }
-
-    func bar() {
-      e = .foo(a: A(), b: nil)   // Ok
-      e = E.foo(a: A(), b: nil)  // Ok
-      baz(e: .foo(a: A(), b: nil))  // Ok
-      baz(e: E.foo(a: A(), b: nil)) // Ok
-    }
-
-    func baz(e: E) {}
-  }
-}

branches/rxwei-patch-1/test/DebugInfo/compiler-flags.swift

@@ -18,5 +18,5 @@
 // Check that we don't write temporary file names in the debug info
 // RUN: env TMP=abc/def TMPDIR=abc/def %target-swift-frontend %s -I abc/def/xyz -g -emit-ir -debug-info-store-invocation -o - | %FileCheck --check-prefix CHECK-TEMP %s
 // RUN: env TMP=%t TMPDIR=%t %target-swift-frontend %s -I %t/xyz -g -emit-ir -debug-info-store-invocation -o - | %FileCheck --check-prefix CHECK-TEMP %s
-// CHECK-TEMP: !DICompileUnit({{.*}} flags: "{{.*}} -I {{(\\22)?}}<temporary-file>
+// CHECK-TEMP: !DICompileUnit({{.*}} flags: "{{.*}} -I <temporary-file>
 

branches/rxwei-patch-1/test/IDE/complete_constructor.swift

@@ -50,8 +50,6 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABLE_1 | %FileCheck %s -check-prefix=AVAILABLE_1
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=AVAILABLE_2 | %FileCheck %s -check-prefix=AVAILABLE_2
 
-// REQUIRES: rdar49240981
-
 func freeFunc() {}
 
 //===---
@@ -92,10 +90,11 @@ func testImplicitConstructors2() {
 }
 func testImplicitConstructors2P() {
   ImplicitConstructors2(#^IMPLICIT_CONSTRUCTORS_2P^#
-// IMPLICIT_CONSTRUCTORS_2P: Begin completions
-// IMPLICIT_CONSTRUCTORS_2P-NEXT: Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#}[')'][#ImplicitConstructors2#]{{; name=.+$}}
-// IMPLICIT_CONSTRUCTORS_2P-NEXT: Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
-// IMPLICIT_CONSTRUCTORS_2P-NEXT: End completions
+// IMPLICIT_CONSTRUCTORS_2P: Begin completions, 3 items
+// IMPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
+// IMPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#}[')'][#ImplicitConstructors2#]{{; name=.+$}}
+// IMPLICIT_CONSTRUCTORS_2P-DAG: Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
+// IMPLICIT_CONSTRUCTORS_2P: End completions
 }
 
 struct ExplicitConstructors1 {
@@ -290,10 +289,11 @@ func testHaveRParen1() {
 
 func testHaveRParen2() {
   ImplicitConstructors2(#^HAVE_RPAREN_2^#)
-// HAVE_RPAREN_2-NOT: Decl[Constructor]
-// HAVE_RPAREN_2:     Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#}[')'][#ImplicitConstructors2#]{{; name=.+$}}
-// HAVE_RPAREN_2:     Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
-// HAVE_RPAREN_2-NOT: Decl[Constructor]
+// HAVE_RPAREN_2: Begin completions, 3 items
+// HAVE_RPAREN_2-DAG: Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
+// HAVE_RPAREN_2-DAG: Decl[Constructor]/CurrNominal: ['(']{#instanceVar: Int#}[')'][#ImplicitConstructors2#]{{; name=.+$}}
+// HAVE_RPAREN_2-DAG: Decl[Constructor]/CurrNominal: ['('][')'][#ImplicitConstructors2#]; name=
+// HAVE_RPAREN_2: End completions
 }
 
 func testHaveComma1() {

branches/rxwei-patch-1/test/Serialization/autolinking-inlinable-inferred.swift

@@ -11,7 +11,10 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-/// UNSUPPORTED: autolink-extract
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnueabihf
+// UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 import autolinking_module_inferred
 

branches/rxwei-patch-1/test/Serialization/autolinking.swift

@@ -21,7 +21,10 @@
 
 // Linux uses a different autolinking mechanism, based on
 // swift-autolink-extract. This file tests the Darwin mechanism.
-// UNSUPPORTED: autolink-extract
+// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnueabihf
+// UNSUPPORTED: OS=freebsd
+// UNSUPPORTED: OS=linux-androideabi
 
 import someModule