third_party/re2/patches/remove-valgrind-code.patch

   1 diff -r ceab86d470c1 re2/dfa.cc
   2 --- a/re2/dfa.cc        Tue Jul 03 16:43:11 2012 +0200
   3 +++ b/re2/dfa.cc        Tue Jul 03 17:03:00 2012 +0200
   4 @@ -27,6 +27,8 @@
   5  #include "util/flags.h"
   6  #include "util/sparse_set.h"
   7
   8 +#define NO_THREAD_SAFETY_ANALYSIS
   9 +
  10  DEFINE_bool(re2_dfa_bail_when_slow, true,
  11              "Whether the RE2 DFA should bail out early "
  12              "if the NFA would be faster (for testing).");
  13 diff -r ceab86d470c1 util/util.h
  14 --- a/util/util.h       Tue Jul 03 16:43:11 2012 +0200
  15 +++ b/util/util.h       Tue Jul 03 17:03:00 2012 +0200
  16 @@ -28,6 +28,8 @@
  17  #include <utility>
  18  #include <set>
  19
  20 +#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
  21 +
  22  // Use std names.
  23  using std::set;
  24  using std::pair;
  25 @@ -86,16 +88,6 @@
  26
  27  #define arraysize(array) (sizeof(array)/sizeof((array)[0]))
  28
  29 -// Fake lock annotations.  For real ones, see
  30 -// http://code.google.com/p/data-race-test/
  31 -#define ANNOTATE_PUBLISH_MEMORY_RANGE(a, b)
  32 -#define ANNOTATE_IGNORE_WRITES_BEGIN()
  33 -#define ANNOTATE_IGNORE_WRITES_END()
  34 -#define ANNOTATE_BENIGN_RACE(a, b)
  35 -#define NO_THREAD_SAFETY_ANALYSIS
  36 -#define ANNOTATE_HAPPENS_BEFORE(x)
  37 -#define ANNOTATE_HAPPENS_AFTER(x)
  38 -
  39  class StringPiece;
  40
  41  string CEscape(const StringPiece& src);
  42 @@ -121,8 +113,6 @@
  43    return ((uint64)x << 32) | y;
  44  }
  45
  46 -int RunningOnValgrind();
  47 -
  48  }  // namespace re2
  49
  50  #include "util/arena.h"