Update re2

Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org

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

[battre, 2015-12-10 08:30:58]

Description was changed from

==========
Update re2

BUG=568119
==========

to

==========
Update re2 to tip of tree. This version does not require any Chrome specific
patches anymore.

BUG=568119
==========

[battre, 2015-12-10 13:32:04]

battre@chromium.org changed reviewers:
+ thakis@chromium.org

[battre, 2015-12-10 13:32:05]

Hi Nico,

could you please review this CL?

I think that we have reached a state, where we can use a vanilla RE2 in Chrome.

There is one regression that I observed:
Autofill generates this error message
"../../third_party/re2/re2/dfa.cc:469: DFA out of memory: prog size 17637 mem
2725434" and I have a CL to address this here:
https://codereview.chromium.org/1515553005

There may be further occurrences, though. I would wait with landing this until I
made sure that no test triggers this error anymore.

Best regards,
Dominic

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
File third_party/re2/patches/re2-android.patch (left):

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
third_party/re2/patches/re2-android.patch:1: diff --git a/util/util.h
b/util/util.h
This has been solved by util/util.h

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
File third_party/re2/patches/re2-libcxx.patch (left):

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
third_party/re2/patches/re2-libcxx.patch:1: diff --git
a/third_party/re2/util/util.h b/third_party/re2/util/util.h
This has been solved by util/util.h

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
File third_party/re2/patches/re2-msan.patch (left):

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
third_party/re2/patches/re2-msan.patch:1: diff --git
a/third_party/re2/util/sparse_array.h b/third_party/re2/util/sparse_array.h
I think this is not needed anymore.

RunningOnValigrind is called in two locations, util/sparse_set.h and
util/sparse_array.h.

The pattern there is the following:
  static bool InitMemory() {
#ifdef MEMORY_SANITIZER
    return true;
#else
    return RunningOnValgrind();
#endif
  }

So this should render this unnecessary.

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
File third_party/re2/patches/re2-msvc9-chrome.patch (left):

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
third_party/re2/patches/re2-msvc9-chrome.patch:1: diff --git a/AUTHORS b/AUTHORS
This seems to be largely upstreamed. Everything compiles nicely on Window bots
now.

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
File third_party/re2/patches/remove-valgrind-code.patch (left):

https://codereview.chromium.org/1516543002/diff/40001/third_party/re2/patches...
third_party/re2/patches/remove-valgrind-code.patch:1: diff --git a/re2/dfa.cc
b/re2/dfa.cc
I think this is not necessary anymore.

[tfarina, 2015-12-12 13:01:22]

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

[tfarina, 2015-12-12 13:01:24]

I have some questions about our patches. I really want to make sure we aren't
missing anything and we don't need them anymore.

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
File third_party/re2/README.chromium (left):

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:17: (patches/remove-valgrind-code.patch)
base/third_party/dynamic_annotations/dynamic_annotations.h include in
util/util.h isn't necessary anymore?

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:19: - Support Android
(patches/re2-android.patch)
OS_ANDROID isn't necessary in util/util.h anymore?

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:21: - Support libcxx (patches/re2-libcxx.patch)
isn't this necessary now because Android moved from stlport?

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:34: (patches/sparse-array-valgrind.patch)
was this upstreamed? really? reilly just did
https://chromium.googlesource.com/chromium/src.git/+/7e7706ee201acbd7e4784fbd...
two days ago.

[battre, 2015-12-12 13:45:05]

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
File third_party/re2/README.chromium (left):

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:17: (patches/remove-valgrind-code.patch)
On 2015/12/12 13:01:24, tfarina wrote:
> base/third_party/dynamic_annotations/dynamic_annotations.h include in
> util/util.h isn't necessary anymore?

All uses of ANNOTATE_ macros have been removed upstream.

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:19: - Support Android
(patches/re2-android.patch)
On 2015/12/12 13:01:24, tfarina wrote:
> OS_ANDROID isn't necessary in util/util.h anymore?

I fully relied on the trybots here that were happy with dropping this.

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:21: - Support libcxx (patches/re2-libcxx.patch)
On 2015/12/12 13:01:24, tfarina wrote:
> isn't this necessary now because Android moved from stlport?

See above. I relied on the trybots.

https://codereview.chromium.org/1516543002/diff/100001/third_party/re2/README...
third_party/re2/README.chromium:34: (patches/sparse-array-valgrind.patch)
On 2015/12/12 13:01:24, tfarina wrote:
> was this upstreamed? really? reilly just did
>
https://chromium.googlesource.com/chromium/src.git/+/7e7706ee201acbd7e4784fbd...
> two days ago.

This is really's patch in Chrome:
https://codereview.chromium.org/1509953005/diff/1/third_party/re2/util/sparse...

And this has landed upstream recently and is included in this patch:
https://codereview.chromium.org/1516543002/diff2/1:100001/third_party/re2/uti...

See
https://github.com/google/re2/commit/dba3349aba83b5588e85e5ecf2b56c97f2d259b7

My understanding was that this should address really's concerns.

[battre, 2015-12-14 08:29:43]

I have added commands for generating an update to README.chromium and executed
them. So the current CL is a result of these commands.

I would propose that we check whether this CL works, then land it and then
consider migrating it to DEPS.

Nico: friendly ping :-)

[tfarina, 2015-12-14 09:26:24]

Description was changed from

==========
Update re2 to tip of tree. This version does not require any Chrome specific
patches anymore.

BUG=568119
==========

to

==========
Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org
==========

[tfarina, 2015-12-14 09:30:05]

On 2015/12/14 08:29:43, battre wrote:
> I have added commands for generating an update to README.chromium and executed
> them. So the current CL is a result of these commands.
> 
Thanks!

> I would propose that we check whether this CL works, then land it and then
> consider migrating it to DEPS.
I think that is Nico's plan. So it is good that we are heading toward this
direction.

> 
> Nico: friendly ping :-)

You have my OK (LGTM) Dominic, but, of course, wait for Nico's approval as I
might be missing something.

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/README...
File third_party/re2/README.chromium (right):

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/README...
third_party/re2/README.chromium:14: To update RE2, execute the following
commands from your Chromium checkout:
Thanks for documenting the instructions. Hopefully we don't have the
complication of dealing with patches anymore (at least not for now). And after
that we can "force" people to upstream first, instead of patching our "fork".

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/re2.gyp
File third_party/re2/re2.gyp (right):

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/re2.gy...
third_party/re2/re2.gyp:21:
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
Are we able to remove this now?

[battre, 2015-12-14 21:25:51]

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/re2.gyp
File third_party/re2/re2.gyp (right):

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/re2.gy...
third_party/re2/re2.gyp:21:
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
On 2015/12/14 09:30:05, tfarina wrote:
> Are we able to remove this now?

I think so. I will try it out tomorrow. Hope that it doesn't block the review.

[Nico, 2015-12-15 19:04:56]

lgtm, thanks much!

Maybe we can make re2 a real dep pulled from a github mirror after this too.

I wouldn't be surprised if this goes through a few revert/reland cycles for
things like valgrind problems (I'm memory sheriff this week, so no need to ping
the current memory sheriff), static initializers, etc, but only one way to find
out.

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/README...
File third_party/re2/README.chromium (right):

https://codereview.chromium.org/1516543002/diff/120001/third_party/re2/README...
third_party/re2/README.chromium:20: $ mv third_party/re2_new third_party/re2
Should probably have some note about updating gyp and gn files too

[battre, 2015-12-15 19:44:37]

Thank you. I have updated the update documentation.

Once this sticks and the bots stay happy, we can replace the dependency with a
DEPS based inclusion and tune the build files to see whether we can remove more
deps and remove some compile flags.

I'll send this to the CQ now.

[battre, 2015-12-15 19:44:45]

The CQ bit was checked by battre@chromium.org

[battre, 2015-12-15 19:44:45]

The patchset sent to the CQ was uploaded after l-g-t-m from
tfarina@chromium.org, thakis@chromium.org
Link to the patchset: https://codereview.chromium.org/1516543002/#ps140001
(title: "updated update instructions")

[commit-bot: I haz the power, 2015-12-15 19:46:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1516543002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1516543002/140001

[commit-bot: I haz the power, 2015-12-15 21:09:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-15 21:09:01]

Try jobs failed on following builders:
  linux_chromium_gn_chromeos_rel on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Nico, 2015-12-15 21:10:03]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2015-12-15 21:12:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1516543002/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1516543002/140001

[commit-bot: I haz the power, 2015-12-15 21:54:31]

Description was changed from

==========
Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org
==========

to

==========
Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org
==========

[commit-bot: I haz the power, 2015-12-15 21:54:32]

Committed patchset #8 (id:140001)

[commit-bot: I haz the power, 2015-12-15 21:55:20]

Description was changed from

==========
Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org
==========

to

==========
Update re2 to tip of tree.

This version does not require any Chrome specific patches anymore.

BUG=568119
R=thakis@chromium.org,tfarina@chromium.org

Committed: https://crrev.com/fd270ec705a75fd4e0883d091d9cf5204918c858
Cr-Commit-Position: refs/heads/master@{#365347}
==========

[commit-bot: I haz the power, 2015-12-15 21:55:21]

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

[battre, 2015-12-16 08:28:20]

A revert of this CL (patchset #8 id:140001) has been created in
https://codereview.chromium.org/1530113002/ by battre@chromium.org.

The reason for reverting is: Dr. Memory complains about uninitialized memory
(see bug)..