third_party/re2: Remove remove-static-initializers.patch.

third_party/re2: Remove remove-static-initializers.patch.

* remove-static-initializers.patch has been landed upstream by Russ in
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb,
remove the patch file now that it was merged upstream.

* Also remove re2-memory-optimization.patch, it also has landed in
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb.

BUG=169860
R=thakis@chromium.org
TBR=cpu@chromium.org

Committed: https://crrev.com/bede0f155727f53983cf55688986a98502fd4927
Cr-Commit-Position: refs/heads/master@{#326432}

[Nico, 2015-04-22 19:33:17]

This isn't quite right, since what was merged upstream is slightly different to
what's in our copy. Also, the README claims that we pull some older version, and
that version + listed cherrypicks + our patches should be what we have in our
tree. Maybe you could cherrypick that commit?

[tfarina, 2015-04-22 19:46:29]

On 2015/04/22 19:33:17, Nico (OOO sick) wrote:
> This isn't quite right, since what was merged upstream is slightly different
to
> what's in our copy. 
My eyes are not spotting the difference, could you show me?

> Also, the README claims that we pull some older version, and
> that version + listed cherrypicks + our patches should be what we have in our
> tree. Maybe you could cherrypick that commit?
How do I do that? in re2 tree I checkout
cc56ba02d9d2bdafa614ad5ebf564dde287625bb, then what?

[Nico, 2015-04-22 19:51:40]

Probably manually (?) Not sure if the real patch applies cleanly. (else you
could try `git checkout master; git checkout -b mergepick; git merge
cc56ba02d9d2bdafa614ad5ebf564dde287625bb; git cl upload` or something like
that)

On Wed, Apr 22, 2015 at 12:46 PM, <tfarina@chromium.org> wrote:

> On 2015/04/22 19:33:17, Nico (OOO sick) wrote:
>
>> This isn't quite right, since what was merged upstream is slightly
>> different
>>
> to
>
>> what's in our copy.
>>
> My eyes are not spotting the difference, could you show me?
>
>  Also, the README claims that we pull some older version, and
>> that version + listed cherrypicks + our patches should be what we have in
>> our
>> tree. Maybe you could cherrypick that commit?
>>
> How do I do that? in re2 tree I checkout
> cc56ba02d9d2bdafa614ad5ebf564dde287625bb, then what?
>
> https://codereview.chromium.org/1096813007/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[tfarina, 2015-04-22 20:17:33]

Want to have another look?

What I did:

In ~/re2:
$ g co cc56ba02d9d2bdafa614ad5ebf564dde287625bb
$ g show --name-only
$ cp re2/compile.cc ~/chromium/src/third_party/re2/re2/compile.cc
...

In Chromium:
$ g diff
# Looked at what changed
$ g co -p
# Discarded some chunks.

There must be a better way to do this. Sigh! :(

[Nico, 2015-04-22 22:17:03]

Cool. I think you can remove patches/re2-memory-optimization.patch  too, that's
also merged by rsc's commit there as far as I can tell.

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/README....
File third_party/re2/README.chromium (right):

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/README....
third_party/re2/README.chromium:30: 2225f94df8ec
Add some "merge upstream XXX" for this

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/re2/com...
File third_party/re2/re2/compile.cc (right):

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/re2/com...
third_party/re2/re2/compile.cc:374: if (IsNoMatch(a))
this isn't from
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/re2/com...
third_party/re2/re2/compile.cc:448: if (IsNoMatch(a))
this isn't from
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb

https://codereview.chromium.org/1096813007/diff/20001/third_party/re2/re2/com...
third_party/re2/re2/compile.cc:506: uint64 key = ((uint64)next << 17) | (lo<<9)
| (hi<<1) | foldcase;
this isn't from
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb

[tfarina, 2015-04-22 23:26:45]

Nico, could you take another look?

I think I did a better work this time looking at the diff side-by-side
https://github.com/google/re2/commit/cc56ba02d9d2bdafa614ad5ebf564dde287625bb...,
and choosing carefully what to keep and what to discard when reviewing the diff
in chromium (git checkout -p is awesome!).

[Nico, 2015-04-22 23:48:28]

lgtm, thanks!

https://codereview.chromium.org/1096813007/diff/60001/third_party/re2/util/ut...
File third_party/re2/util/util.h (right):

https://codereview.chromium.org/1096813007/diff/60001/third_party/re2/util/ut...
third_party/re2/util/util.h:49: #if defined(__GNUC__) && !defined(USE_CXX0X) &&
!defined(_LIBCPP_ABI_VERSION) && !defined(OS_ANDROID)
ugh, rsc merged this bit too? That doesn't make sense outside of chromium builds
:-(

[tfarina, 2015-04-22 23:57:51]

https://codereview.chromium.org/1096813007/diff/60001/third_party/re2/util/ut...
File third_party/re2/util/util.h (right):

https://codereview.chromium.org/1096813007/diff/60001/third_party/re2/util/ut...
third_party/re2/util/util.h:49: #if defined(__GNUC__) && !defined(USE_CXX0X) &&
!defined(_LIBCPP_ABI_VERSION) && !defined(OS_ANDROID)
On 2015/04/22 23:48:28, Nico (OOO sick) wrote:
> ugh, rsc merged this bit too? That doesn't make sense outside of chromium
builds
> :-(

Yep, it is all there. :/

https://code.googlesource.com/re2/+/master/util/util.h#47

[tfarina, 2015-04-23 01:03:18]

tfarina@chromium.org changed reviewers:
+ cpu@chromium.org

[tfarina, 2015-04-23 01:03:18]

TBRing Carlos for this...

[tfarina, 2015-04-23 01:04:00]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2015-04-23 01:04:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1096813007/60001

[commit-bot: I haz the power, 2015-04-23 02:49:01]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-04-23 02:49:55]

Patchset 4 (id:??) landed as
https://crrev.com/bede0f155727f53983cf55688986a98502fd4927
Cr-Commit-Position: refs/heads/master@{#326432}