Revert the Mac Valgrind binaries that caused new leaks to be reported.

Revert the Mac Valgrind binaries that caused new leaks to be reported.

TBR=timurrrr
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109219

[Alexander Potapenko, 2011-11-09 10:52:29]

TBR

[Timur Iskhodzhanov, 2011-11-09 10:54:22]

LGTM

On Wed, Nov 9, 2011 at 2:52 PM,  <glider@chromium.org> wrote:
> Reviewers: Timur Iskhodzhanov,
>
> Message:
> TBR
>
> Description:
> Revert the Mac Valgrind binaries that caused new leaks to be reported.
>
> TBR=timurrrr
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=109219
>
> Please review this at http://codereview.chromium.org/8511005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/deps/third_party/valgrind/
>
> Affected files:
>  M     README.chromium
>  M     binaries/mac/bin/ms_print
>  M     binaries/mac/bin/valgrind
>  M     binaries/mac/bin/valgrind-listener
>  M     binaries/mac/bin/vgdb
>  M     binaries/mac/lib/valgrind/default.supp
>  M     binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so
>  M
> binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so
>  M     binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so
>  M
> binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so
>  M     binaries/mac/lib/valgrind/memcheck-amd64-darwin
>  M
> binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin
>  M     binaries/mac/lib/valgrind/memcheck-x86-darwin
>  M
> binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin
>  M     binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so
>  M
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so
>  M     binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so
>  M
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so
>  M     binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so
>  M
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so
>  M     binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so
>  M
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist
>  M
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so
>  M     scripts/build-memcheck-for-chromium.sh
>  M     scripts/common.sh
>
>
> Index: README.chromium
> ===================================================================
> --- README.chromium     (revision 109216)
> +++ README.chromium     (working copy)
> @@ -2,7 +2,7 @@
>  Version: unknown
>
>  Memcheck version on Linux (valgrind-variant): 112
> -Memcheck version on Mac 10.5 (valgrind-variant): 122
> +Memcheck version on Mac 10.5 (valgrind-variant): 109
>  Memcheck version on Mac 10.6 (valgrind-variant): 106
>
>  TSan version on Linux: unknown
> Index: binaries/mac/bin/ms_print
> ===================================================================
> --- binaries/mac/bin/ms_print   (revision 109218)
> +++ binaries/mac/bin/ms_print   (working copy)
> @@ -55,7 +55,7 @@
>  my $tmp_file = "ms_print.tmp.$$";
>
>  # Version number.
> -my $version = "3.8.0.SVN";
> +my $version = "3.7.0.SVN";
>
>  # Args passed, for printing.
>  my $ms_print_args;
> Index: binaries/mac/bin/valgrind
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/bin/valgrind-listener
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/bin/vgdb
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/default.supp
> ===================================================================
> --- binaries/mac/lib/valgrind/default.supp      (revision 109218)
> +++ binaries/mac/lib/valgrind/default.supp      (working copy)
> @@ -1,8 +1,29 @@
>  # This is a generated file, composed of the following suppression rules:
> -#  exp-sgcheck.supp xfree-3.supp xfree-4.supp darwin9-drd.supp darwin9.supp
> +#  exp-ptrcheck.supp xfree-3.supp xfree-4.supp darwin9-drd.supp
> darwin9.supp
>  {
> +   lib-X11-used-old-pointer-after-realloc-1
> +   exp-ptrcheck:Heap
> +   fun:strlen
> +   obj:/usr/lib*/libX11.so*
> +   obj:/usr/lib*/libX11.so*
> +}
> +{
> +   lib-X11-used-old-pointer-after-realloc-2
> +   exp-ptrcheck:Heap
> +   obj:/usr/lib*/libX11.so*
> +   obj:/usr/lib*/libX11.so*
> +}
> +
> +{
> +   ld-2.X-invalid-Add32/64-who-knows
> +   exp-ptrcheck:Arith
> +   obj:/*lib*/ld-2.*so*
> +   obj:/*lib*/ld-2.*so*
> +}
> +
> +{
>    ld-2.X possibly applying relocations
> -   exp-sgcheck:SorG
> +   exp-ptrcheck:SorG
>    obj:/*lib*/ld-2.*so*
>    obj:/*lib*/ld-2.*so*
>  }
> @@ -10,17 +31,63 @@
>  # I'm pretty sure this is a false positive caused by the sg_ stuff
>  {
>    glibc realpath false positive
> -   exp-sgcheck:SorG
> +   exp-ptrcheck:SorG
>    fun:realpath
>    fun:*
>  }
>
>  {
> +   If I had to guess, inlined or nameless strlen etc in ld.so
> +   exp-ptrcheck:Heap
> +   obj:/*lib*/ld-2.*so*
> +   obj:/*lib*/ld-2.*so*
> +}
> +
> +{
>    I think this is glibc's ultra optimised getenv doing 2 byte reads
> -   exp-sgcheck:SorG
> +   exp-ptrcheck:SorG
>    fun:getenv
>  }
>
> +{
> +   Occurs on Fedora 7--9?
> +   exp-ptrcheck:Heap
> +   fun:_dl_fini
> +   fun:exit
> +   fun:(below main)
> +}
> +
> +
> +# Invalid read of size 16
> +#    at 0x5643A5C: ??? (strcpy.S:94)
> +#    by 0x50C6A99: XtResolvePathname (in /usr/lib/libXt.so.6.0.0)
> +#    by 0x50C3856: XtScreenDatabase (in /usr/lib/libXt.so.6.0.0)
> +#    by 0x50C4386: _XtDisplayInitialize (in /usr/lib/libXt.so.6.0.0)
> +{
> +   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept
> +   exp-ptrcheck:Heap
> +   obj:/*lib*/libc-2.*so*
> +   obj:/*lib*/libX*so*
> +}
> +{
> +   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 2
> +   exp-ptrcheck:Heap
> +   obj:/*lib*/libc-2.*so*
> +   obj:/*lib*/libICE*so*
> +}
> +{
> +   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 3
> +   exp-ptrcheck:Heap
> +   obj:/*lib*/libc-2.*so*
> +   obj:/*lib*/libglib*so*
> +}
> +{
> +   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 4
> +   exp-ptrcheck:Heap
> +   obj:/*lib*/libc-2.*so*
> +   obj:/*lib*/libfontconfig*so*
> +}
> +
>  ##----------------------------------------------------------------------##
>
>  # Errors to suppress by default with XFree86 3.3.6)
> Index: binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
> binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
> binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist
>       (revision 109218)
> +++
> binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Info.plist
>       (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>x86_64</key>
> -
> <string>BB1A383D-2C92-4975-BF67-C0FA67DD7DF1</string>
> +
> <string>E14AF63E-EFBD-0B20-AB82-488B8A4AEC8D</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/libmpiwrap-amd64-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
> binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
> binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist
> (revision 109218)
> +++
> binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Info.plist
> (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>i386</key>
> -
> <string>F84E69B7-8762-8EE2-F456-511D742F0AB0</string>
> +
> <string>7128EE58-DE0A-2438-A3A0-4309F234A816</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/libmpiwrap-x86-darwin.so.dSYM/Contents/Resources/DWARF/libmpiwrap-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/memcheck-amd64-darwin
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
> binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist
> ===================================================================
> --- binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist
>    (revision 109218)
> +++ binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Info.plist
>    (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>x86_64</key>
> -
> <string>7C312DC8-27EC-BFCB-D4CC-19957F480B10</string>
> +
> <string>2BA9026F-5DFA-E37F-8242-941BF532A0E6</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/memcheck-amd64-darwin.dSYM/Contents/Resources/DWARF/memcheck-amd64-darwin
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/memcheck-x86-darwin
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
> binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist
> ===================================================================
> --- binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist
>    (revision 109218)
> +++ binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Info.plist
>    (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>i386</key>
> -
> <string>C39D3CCE-F2F4-43AB-85F9-61ED3CB1F439</string>
> +
> <string>C1220B57-5A05-4F0B-8066-BF478CBA4507</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/memcheck-x86-darwin.dSYM/Contents/Resources/DWARF/memcheck-x86-darwin
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist
>   (revision 109218)
> +++
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Info.plist
>   (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>x86_64</key>
> -
> <string>95CAC2CA-D845-CC4F-FF14-3DA6394670FB</string>
> +
> <string>1C470C17-4D66-A7FF-83A6-6AC93B025488</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/vgpreload_core-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist
>     (revision 109218)
> +++
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Info.plist
>     (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>i386</key>
> -
> <string>8A429700-E4F2-827A-5542-FB1CFA198D63</string>
> +
> <string>CCD7FD2F-9935-6F5D-D1C1-CE041F843968</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/vgpreload_core-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_core-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist
>       (revision 109218)
> +++
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Info.plist
>       (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>x86_64</key>
> -
> <string>351335F7-AABF-21E1-0C9C-8975A261F0B2</string>
> +
> <string>7A9603B3-7455-8C7B-57CA-F54FABED095D</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/vgpreload_memcheck-amd64-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-amd64-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index:
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist
> ===================================================================
> ---
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist
> (revision 109218)
> +++
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Info.plist
> (working copy)
> @@ -19,7 +19,7 @@
>                <key>dSYM_UUID</key>
>                <dict>
>                        <key>i386</key>
> -
> <string>8680C6E9-640E-E453-155C-830EF757EB1D</string>
> +
> <string>B9E42AB9-BA83-772A-1989-127FB6B971F1</string>
>                </dict>
>        </dict>
>  </plist>
> Index:
>
binaries/mac/lib/valgrind/vgpreload_memcheck-x86-darwin.so.dSYM/Contents/Resources/DWARF/vgpreload_memcheck-x86-darwin.so
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
> Index: scripts/build-memcheck-for-chromium.sh
> ===================================================================
> --- scripts/build-memcheck-for-chromium.sh      (revision 109216)
> +++ scripts/build-memcheck-for-chromium.sh      (working copy)
> @@ -9,7 +9,7 @@
>  source $THISDIR/common.sh
>
>  # Use a fixed version of valgrind-variant.
> -MEMCHECK_VV_REV=122
> +MEMCHECK_VV_REV=112
>
>  VG_MEMCHECK_DIR="$VG_SRC_DIR/valgrind-memcheck"
>  checkout_and_patch_valgrind_variant "$MEMCHECK_VV_REV" "$VG_MEMCHECK_DIR"
> Index: scripts/common.sh
> ===================================================================
> --- scripts/common.sh   (revision 109216)
> +++ scripts/common.sh   (working copy)
> @@ -9,7 +9,7 @@
>
>  THISDIR=$(dirname "${0}")
>  THISDIR=$(cd "${THISDIR}" && /bin/pwd)
> -VG_SRC_DIR=/tmp/valgrind-src-glider
> +VG_SRC_DIR=/tmp/valgrind-src
>
>  system_is_snow_leopard() {
>   uname -r | grep 10\.[0-9]\.[0-9] >/dev/null
>
>
>