Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: third_party/re2/patches/remove-valgrind-code.patch

Issue 1530113002: Revert of Update re2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/re2/patches/re2-msvc9-chrome.patch ('k') | third_party/re2/patches/sparse-array-valgrind.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/re2/patches/remove-valgrind-code.patch
diff --git a/third_party/re2/patches/remove-valgrind-code.patch b/third_party/re2/patches/remove-valgrind-code.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ba6007a279754ad43d0398fde054a0619f50346a
--- /dev/null
+++ b/third_party/re2/patches/remove-valgrind-code.patch
@@ -0,0 +1,35 @@
+diff --git a/re2/dfa.cc b/re2/dfa.cc
+index 2556c0f..f1fc7b0 100644
+--- a/re2/dfa.cc
++++ b/re2/dfa.cc
+@@ -27,6 +27,8 @@
+ #include "util/flags.h"
+ #include "util/sparse_set.h"
+
++#define NO_THREAD_SAFETY_ANALYSIS
++
+ DEFINE_bool(re2_dfa_bail_when_slow, true,
+ "Whether the RE2 DFA should bail out early "
+ "if the NFA would be faster (for testing).");
+diff --git a/util/util.h b/util/util.h
+index 471c64f..c46ab1b 100644
+--- a/util/util.h
++++ b/util/util.h
+@@ -27,6 +27,8 @@
+ #include <utility>
+ #include <set>
+
++#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
++
+ // Use std names.
+ using std::set;
+ using std::pair;
+@@ -119,8 +121,6 @@ static inline uint64 Hash64StringWithSeed(const char* s, int len, uint32 seed) {
+ return ((uint64)x << 32) | y;
+ }
+
+-int RunningOnValgrind();
+-
+ } // namespace re2
+
+ #include "util/arena.h"
« no previous file with comments | « third_party/re2/patches/re2-msvc9-chrome.patch ('k') | third_party/re2/patches/sparse-array-valgrind.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698