---

yaml
---
r: 347325
b: refs/heads/master
c: 1c09e24
h: refs/heads/master
i:
  347323: 3363b58

Author: compnerd

[refs]

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

trunk/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

trunk/lib/LLVMPasses/LLVMSwiftAA.cpp

@@ -41,7 +41,8 @@ ModRefInfo SwiftAAResult::getModRefInfo(const llvm::CallBase *Call,
     return ModRefInfo::NoModRef;
 
   // Otherwise, delegate to the rest of the AA ModRefInfo machinery.
-  return AAResultBase::getModRefInfo(Call, Loc);
+  AAQueryInfo AAQI;
+  return AAResultBase::getModRefInfo(Call, Loc, AAQI);
 }
 
 //===----------------------------------------------------------------------===//

trunk/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);