<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi Michael,<div class=""><br class=""></div><div class="">A bunch of commits were reverted by the merge commit you created, do you mind creating a new merge that has these included perhaps?</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">ee7f011842d8a9bd938106e9093509acca64b9cf</span><span style="font-variant-ligatures: no-common-ligatures" class=""> [Omit needless words] Don't split setters, "action-like" methods.</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">9d805512401d48216809337c33c18a979850158b</span><span style="font-variant-ligatures: no-common-ligatures" class=""> [Serialization] Encapsulate group name collectors to strategies. NFC</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">fec4bd2ad1386d2339b32dbcaf2511cc62d6c868</span><span style="font-variant-ligatures: no-common-ligatures" class=""> Address Jordan's code review comments. NFC</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">b11f7dbade6c6a9ece5bc113f89ff20fa9775f40</span><span style="font-variant-ligatures: no-common-ligatures" class=""> Merge pull request #1224 from practicalswift/swiftc-28250-swift-typechecker-typecheckdecl</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">96b542eed408f1ad5455a99cced7d5f40852f96b</span><span style="font-variant-ligatures: no-common-ligatures" class=""> SILGen: Clean up witness thunk re-abstraction</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">ef37153f49dce5d795ff1b8f4cade00fefd1e906</span><span style="font-variant-ligatures: no-common-ligatures" class=""> Merge pull request #1222 from practicalswift/mark-crashes-as-duplicates</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">473e9bc8ffb132f454551dbd121377c44b551d71</span><span style="font-variant-ligatures: no-common-ligatures" class=""> Adopt llvm::TrailingObjects for TypeRefs</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">6779a99b5531b92a8f64d09bab44d2a0f1e29491</span><span style="font-variant-ligatures: no-common-ligatures" class=""> [swiftc] Add test case for crash triggered in swift::TypeChecker::typeCheckDecl(swift::Decl*, bool)</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #afad24" class="">f1ad829890495659ca69f30913e9372e2767cff2</span><span style="font-variant-ligatures: no-common-ligatures" class=""> Pin the reflection data sections on Linux</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(175, 173, 36);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">1d0ee20213c888a37bb3e0b3eb170f16498e2769</span><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> Add tests for decoding type references</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(175, 173, 36);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">a758e3d7338b6a6cb995e464a1e1d54ed0014065</span><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> Add associated type name typeref</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(175, 173, 36);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""><br class=""></span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(175, 173, 36);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class="">Slava</span></div><div style="margin: 0px; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(175, 173, 36);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""><br class=""></span></div><div><blockquote type="cite" class=""><div class="">On Feb 7, 2016, at 6:03 AM, Michael Gottesman via swift-dev <<a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">I.e. make sure to update your llvm/clang now.<br class=""><br class="">Michael<br class=""><br class=""><blockquote type="cite" class="">On Feb 7, 2016, at 5:58 AM, Michael Gottesman via swift-dev <<a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a>> wrote:<br class=""><br class="">Its landed. I am going to baby sit the bots for a little bit.<br class=""><br class="">Michael<br class=""><br class=""><blockquote type="cite" class="">On Feb 6, 2016, at 7:05 PM, Michael Gottesman via swift-dev <<a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a>> wrote:<br class=""><br class="">An update:<br class=""><br class="">We ran into delays since commits committed since I last did the incremental merge last Wednesday conflicted with the stable merge, but those are fixed now. I am now performing the last test run on the CI.. It is going to take a little bit. Then I am going to land this.<br class=""><br class="">Please be careful with what you commit.<br class=""><br class="">Thank you for your patience,<br class="">Michael<br class=""><br class=""><blockquote type="cite" class="">On Feb 6, 2016, at 1:48 PM, Michael Gottesman via swift-dev <<a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a>> wrote:<br class=""><br class="">I am preparing the final swift stable merge today. I will email when it lands.<br class=""><br class="">In the mean time please do not cherry-pick anything into the stable llvm/clang repositories. Swift only changes are generally ok.<br class=""><br class="">Michael<br class=""><br class=""><blockquote type="cite" class="">On Feb 4, 2016, at 12:34 PM, Michael Gottesman via swift-dev <<a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a>> wrote:<br class=""><br class="">This is just a reminder that the stable merge is going to be happening this weekend on Saturday, Feb 6. This date was chosen in order to reduce the churn going on in tree while the merge is occurring.<br class=""><br class="">I will send out an email on Saturday before I begin the merge.<br class=""><br class="">Michael<br class=""><br class=""><blockquote type="cite" class="">On Feb 2, 2016, at 12:23 PM, Michael Gottesman <<a href="mailto:mgottesman@apple.com" class="">mgottesman@apple.com</a>> wrote:<br class=""><br class="">Due to the speed at which LLVM/Clang and Swift move, we do not build Swift against ToT LLVM. We tried this in the past and it resulted in us spending a lot of time dealing with upstream churn and not working on swift. To work around this problem, we now build against stable snapshots of LLVM/Clang that are updated as soon as possible given a minimum break of 2-3 weeks in between such updates (1).<br class=""><br class="">Later this week, I will be performing such an update to the stable snapshots of LLVM/Clang. This will involve changes to Swift and LLDB to work with the new LLVM/Clang. I will send out an email the day I perform it as well as right before I perform the operation.<br class=""><br class="">I have verified that these changes work on the current x86_64 OS X/ubuntu builds via the CI system. For those supporting other platforms if one wishes to test against the stable merge before it lands please check out the following branches:<br class=""><br class="">1. swift-llvm:stable-next<br class="">2. swift-clang: stable-next<br class="">3. swift:master-next<br class="">4. swift-lldb:master-next<br class=""><br class="">Then perform the normal work flow for testing your build.<br class=""><br class="">Thanks,<br class="">Michael<br class=""><br class="">(1) The reason for mentioning a minimum and not a maximum time is that sometimes it takes longer to perform a merge due to disruptive upstream changes. The minimum cadence is meant to provide some stability even if the upstream changes are not disruptive.<br class=""></blockquote><br class="">_______________________________________________<br class="">swift-dev mailing list<br class=""><a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-dev<br class=""></blockquote><br class="">_______________________________________________<br class="">swift-dev mailing list<br class=""><a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-dev<br class=""></blockquote><br class="">_______________________________________________<br class="">swift-dev mailing list<br class=""><a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-dev<br class=""></blockquote><br class="">_______________________________________________<br class="">swift-dev mailing list<br class=""><a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-dev<br class=""></blockquote><br class="">_______________________________________________<br class="">swift-dev mailing list<br class=""><a href="mailto:swift-dev@swift.org" class="">swift-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-dev<br class=""></div></div></blockquote></div><br class=""></div></body></html>