[swift-dev] Stable Merge later this week

Sun Feb 7 23:40:59 CST 2016

Ok, I re-committed the changes.

Thanks,

Slava

> On Feb 7, 2016, at 9:37 PM, Michael Gottesman <mgottesman at apple.com> wrote:
> 
> I would just re-commit the changes. I think there was a timing issue the afternoon I was preparing.
> 
> Michael
> 
>> On Feb 7, 2016, at 7:05 PM, Slava Pestov <spestov at apple.com <mailto:spestov at apple.com>> wrote:
>> 
>> Hi Michael,
>> 
>> In case it helps, I created a branch with all missing commits cherry-picked, with the merges ‘flattened’:
>> 
>> https://github.com/slavapestov/swift/commits/add-missing-commits <https://github.com/slavapestov/swift/commits/add-missing-commits>
>> 
>> Slava
>> 
>>> On Feb 7, 2016, at 6:53 PM, Slava Pestov <spestov at apple.com <mailto:spestov at apple.com>> wrote:
>>> 
>>> I tried to cherry-pick the missing changes over but I don’t know how to cherry-pick a merge. Going back to the old origin/master for now.
>>> 
>>> I suggest we don’t push any code until this is resolved. It is the weekend, after all :-)
>>> 
>>> Slava
>>> 
>>>> On Feb 7, 2016, at 6:36 PM, Slava Pestov via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>> 
>>>> Hi Michael,
>>>> 
>>>> A bunch of commits were reverted by the merge commit you created, do you mind creating a new merge that has these included perhaps?
>>>> 
>>>> ee7f011842d8a9bd938106e9093509acca64b9cf [Omit needless words] Don't split setters, "action-like" methods.
>>>> 9d805512401d48216809337c33c18a979850158b [Serialization] Encapsulate group name collectors to strategies. NFC
>>>> fec4bd2ad1386d2339b32dbcaf2511cc62d6c868 Address Jordan's code review comments. NFC
>>>> b11f7dbade6c6a9ece5bc113f89ff20fa9775f40 Merge pull request #1224 from practicalswift/swiftc-28250-swift-typechecker-typecheckdecl
>>>> 96b542eed408f1ad5455a99cced7d5f40852f96b SILGen: Clean up witness thunk re-abstraction
>>>> ef37153f49dce5d795ff1b8f4cade00fefd1e906 Merge pull request #1222 from practicalswift/mark-crashes-as-duplicates
>>>> 473e9bc8ffb132f454551dbd121377c44b551d71 Adopt llvm::TrailingObjects for TypeRefs
>>>> 6779a99b5531b92a8f64d09bab44d2a0f1e29491 [swiftc] Add test case for crash triggered in swift::TypeChecker::typeCheckDecl(swift::Decl*, bool)
>>>> f1ad829890495659ca69f30913e9372e2767cff2 Pin the reflection data sections on Linux
>>>> 1d0ee20213c888a37bb3e0b3eb170f16498e2769 Add tests for decoding type references
>>>> a758e3d7338b6a6cb995e464a1e1d54ed0014065 Add associated type name typeref
>>>> 
>>>> Slava
>>>> 
>>>>> On Feb 7, 2016, at 6:03 AM, Michael Gottesman via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>>> 
>>>>> I.e. make sure to update your llvm/clang now.
>>>>> 
>>>>> Michael
>>>>> 
>>>>>> On Feb 7, 2016, at 5:58 AM, Michael Gottesman via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>>>> 
>>>>>> Its landed. I am going to baby sit the bots for a little bit.
>>>>>> 
>>>>>> Michael
>>>>>> 
>>>>>>> On Feb 6, 2016, at 7:05 PM, Michael Gottesman via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>>>>> 
>>>>>>> An update:
>>>>>>> 
>>>>>>> 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.
>>>>>>> 
>>>>>>> Please be careful with what you commit.
>>>>>>> 
>>>>>>> Thank you for your patience,
>>>>>>> Michael
>>>>>>> 
>>>>>>>> On Feb 6, 2016, at 1:48 PM, Michael Gottesman via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>>>>>> 
>>>>>>>> I am preparing the final swift stable merge today. I will email when it lands.
>>>>>>>> 
>>>>>>>> In the mean time please do not cherry-pick anything into the stable llvm/clang repositories. Swift only changes are generally ok.
>>>>>>>> 
>>>>>>>> Michael
>>>>>>>> 
>>>>>>>>> On Feb 4, 2016, at 12:34 PM, Michael Gottesman via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>>>>>>>> 
>>>>>>>>> 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.
>>>>>>>>> 
>>>>>>>>> I will send out an email on Saturday before I begin the merge.
>>>>>>>>> 
>>>>>>>>> Michael
>>>>>>>>> 
>>>>>>>>>> On Feb 2, 2016, at 12:23 PM, Michael Gottesman <mgottesman at apple.com <mailto:mgottesman at apple.com>> wrote:
>>>>>>>>>> 
>>>>>>>>>> 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).
>>>>>>>>>> 
>>>>>>>>>> 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.
>>>>>>>>>> 
>>>>>>>>>> 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:
>>>>>>>>>> 
>>>>>>>>>> 1. swift-llvm:stable-next
>>>>>>>>>> 2. swift-clang: stable-next
>>>>>>>>>> 3. swift:master-next
>>>>>>>>>> 4. swift-lldb:master-next
>>>>>>>>>> 
>>>>>>>>>> Then perform the normal work flow for testing your build.
>>>>>>>>>> 
>>>>>>>>>> Thanks,
>>>>>>>>>> Michael
>>>>>>>>>> 
>>>>>>>>>> (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.
>>>>>>>>> 
>>>>>>>>> _______________________________________________
>>>>>>>>> swift-dev mailing list
>>>>>>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>>>>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>>>>>>> 
>>>>>>>> _______________________________________________
>>>>>>>> swift-dev mailing list
>>>>>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>>>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>>>>>> 
>>>>>>> _______________________________________________
>>>>>>> swift-dev mailing list
>>>>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>>>>> 
>>>>>> _______________________________________________
>>>>>> swift-dev mailing list
>>>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>>>> 
>>>>> _______________________________________________
>>>>> swift-dev mailing list
>>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>>> 
>>>> _______________________________________________
>>>> swift-dev mailing list
>>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>>> 
>> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.swift.org/pipermail/swift-dev/attachments/20160207/8a8f7a1d/attachment.html>