Widen operator new(unsigned int) and operator new(int) in

current suppressions to match either.  Matches
recent change in memcheck_analyze.py.
(Only doing it in suppressions_mac.txt in case
somebody decides to move a suppression to suppressions.txt.)

Also shorten a too-long suppression that was just checked in.

Review URL: http://codereview.chromium.org/255027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27656 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 22 insertions, 31 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 1b4626b..f28df83 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -329,7 +329,7 @@
    # See comment on struct CheckOpString
    logging::MakeCheckOpString result not freed because app is aborting
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN7logging17MakeCheckOpStringIiiEEPSsRKT_RKT0_PKc
 }
 {
@@ -358,7 +358,7 @@
    # very common in ui tests
    bug_16096
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
    fun:_ZNSs4_Rep8_M_cloneERKSaIcEj
    fun:_ZNSs7reserveEj
@@ -383,7 +383,7 @@
    # For now, in Valgrind, we'll add suppressions to ignore these leaks.
    bug_6532
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_Z17NewRunnableMethodIN3IPC12ChannelProxy7ContextEMS2_FvvEEP14CancelableTaskPT_T0_
 }
 {
@@ -414,7 +414,7 @@
    # See http://crbug.com/11139
    bug_11139
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN14ProcessWatcher23EnsureProcessTerminatedEi
 }
 {
@@ -440,7 +440,7 @@
    # ditto, but tweaked to fire on bots, more robust against optimizer changes?
    bug_16089b
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN4base22LinuxDynamicThreadPool8PostTaskEP4Task
    ...
    fun:_ZN18chrome_browser_net9DnsMaster24PreLockedScheduleLookupsEv
@@ -449,7 +449,7 @@
    # ditto, but tweaked for cat hit by URLFetcherTest.SameThreadsTest on bot
    bug_16089c
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN4base22LinuxDynamicThreadPool8PostTaskEP4Task
    ...
    fun:_ZN3net13TCPConnectJob13DoResolveHostEv
@@ -563,7 +563,7 @@
 {
    bug_16577
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN12RenderThread22InformHostOfCacheStatsEv
 }
 {
@@ -588,7 +588,7 @@
 {
    bug_16584
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    ...
    fun:_ZN7WebCore10CSSRuleSet12addToRuleSetEPNS_16AtomicStringImplERN3WTF7HashMapIS2_PNS_15CSSRuleDataListENS3_7PtrHashIS2_EENS3_10HashTraitsIS2_EENS9_IS6_EEEEPNS_12CSSStyleRuleEPNS_11CSSSelectorE
    fun:_ZN7WebCore10CSSRuleSet7addRuleEPNS_12CSSStyleRuleEPNS_11CSSSelectorE
@@ -735,7 +735,7 @@
 {
    bug_19463
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN4base19MessagePumpLibevent4InitEv
    fun:_ZN4base19MessagePumpLibeventC1Ev
    fun:_ZN11MessageLoopC1ENS_4TypeE
@@ -743,7 +743,7 @@
 {
    bug_19546a
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN19SafeBrowsingService5StartEv
    fun:_ZN19SafeBrowsingService10InitializeEP11MessageLoop
    fun:_ZN22ResourceDispatcherHost10InitializeEv
@@ -754,7 +754,7 @@
 {
    bug_19546b
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN19SafeBrowsingService14OnIOInitializeEP11MessageLoopRKSsS3_
    fun:_ZN14RunnableMethodI19SafeBrowsingServiceMS0_FvP11MessageLoopRKSsS4_E6Tuple3IS2_SsSsEE3RunEv
 }
@@ -916,7 +916,7 @@
 {
    bug_22098
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN4base19MessagePumpLibevent19WatchFileDescriptorEibNS0_4ModeEPNS0_21FileDescriptorWatcherEPNS0_7WatcherE
    fun:_ZN16MessageLoopForIO19WatchFileDescriptorEibNS_4ModeEPN4base19MessagePumpLibevent21FileDescriptorWatcherEPNS2_7WatcherE
    fun:_ZN3IPC7Channel11ChannelImpl23ProcessOutgoingMessagesEv
@@ -939,7 +939,7 @@
 {
    bug_22109
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
    fun:_ZNSs4_Rep8_M_cloneERKSaIcEj
    fun:_ZNSs7reserveEj
@@ -1025,7 +1025,7 @@
 {
    bug_22984
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN27ScopedRunnableMethodFactoryI12SpellCheckerE17NewRunnableMethodIMS0_FvvEEEP4TaskT_
    fun:_ZN12SpellChecker18OnURLFetchCompleteEPK10URLFetcherRK4GURLRK16URLRequestStatusiRKSt6vectorISsSaISsEERKSs
    fun:_ZN10URLFetcher4Core21OnCompletedURLRequestERK16URLRequestStatus
@@ -1047,7 +1047,7 @@
 {
    bug_23104
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN7WebCore9CSSParser23createFloatingValueListEv
    fun:_Z10cssyyparsePv
    fun:_ZN7WebCore9CSSParser10parseSheetEPNS_13CSSStyleSheetERKNS_6StringE
@@ -1126,20 +1126,11 @@
    fun:_ZN7WebCore4Node13dispatchEventEN3WTF10PassRefPtrINS_5EventEEE
    fun:_ZN7WebCore8Document15finishedParsingEv
    fun:_ZN7WebCore10HTMLParser8finishedEv
-   fun:_ZN7WebCore13HTMLTokenizer3endEv
-   fun:_ZN7WebCore13HTMLTokenizer6finishEv
-   fun:_ZN7WebCore8Document13finishParsingEv
-   fun:_ZN7WebCore11FrameLoader27endIfNotLoadingMainResourceEv
-   fun:_ZN7WebCore11FrameLoader3endEv
-   fun:_ZN7WebCore14DocumentLoader15finishedLoadingEv
-   fun:_ZN7WebCore11FrameLoader15finishedLoadingEv
-   fun:_ZN7WebCore18MainResourceLoader16didFinishLoadingEv
-   fun:_ZN7WebCore14ResourceLoader16didFinishLoadingEPNS_14ResourceHandleE
 }
 {
    bug_23310
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    fun:_ZN7history14HistoryBackend12SetPageTitleERK4GURLRKSbIwSt11char_traitsIwESaIwEE
    fun:_Z16DispatchToMethodIN7history14HistoryBackendEMS1_FvRK4GURLRKSbIwSt11char_traitsIwESaIwEEES2_S8_EvPT_T0_RK6Tuple2IT1_T2_E
    fun:_ZN14RunnableMethodIN7history14HistoryBackendEMS1_FvRK4GURLRKSbIwSt11char_traitsIwESaIwEEE6Tuple2IS2_S8_EE3RunEv
@@ -1148,7 +1139,7 @@
 {
    bug_23313
    Memcheck:Leak
-   fun:_Znwj
+   fun:_Znw*
    ...
    fun:_ZNSt6vectorIN4skia19ConvolutionFilter1D14FilterInstanceESaIS2_EE9push_backERKS2_
    fun:_ZN4skia19ConvolutionFilter1D9AddFilterEiPKsi
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index fd92397..9eaa9e2 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -37,7 +37,7 @@
    # Mac system library leak?  Only suppress in tests for now.
    mac_init_appleevents_leak
    Memcheck:Leak
-   fun:_Znwm
+   fun:_Znw*
    fun:sendSimpleEventToSelf
    fun:aeInitializeFromHIToolbox
    fun:INIT_AppleEvents
@@ -75,7 +75,7 @@
    # CoreAudio leak.  See http://crbug.com/9351
    bug_9351
    Memcheck:Leak
-   fun:_Znwm
+   fun:_Znw*
    fun:_ZN12HALCADClient19AddPropertyListenerEmPK26AudioObjectPropertyAddressPFlmmS2_PvES3_
    fun:_ZN16HALDefaultDevice22InstallServerListenersEv
    fun:_ZN16HALDefaultDevice10InitializeEv
@@ -543,7 +543,7 @@
 {
    bug_20582
    Memcheck:Leak
-   fun:_Znwm
+   fun:_Znw*
    fun:_ZN4base19MessagePumpLibevent19WatchFileDescriptorEibNS0_4ModeEPNS0_21FileDescriptorWatcherEPNS0_7WatcherE
    fun:_ZN16MessageLoopForIO19WatchFileDescriptorEibNS_4ModeEPN4base19MessagePumpLibevent21FileDescriptorWatcherEPNS2_7WatcherE
    fun:_ZN3IPC7Channel11ChannelImpl23ProcessOutgoingMessagesEv
@@ -592,7 +592,7 @@
 {
    bug_20814_b
    Memcheck:Leak
-   fun:_Znwm
+   fun:_Znw*
    fun:_Z26getAllCarbonLazyValues2000v
    fun:CLVVisitValuesForKey
    fun:INIT_ResourceManager
@@ -861,7 +861,7 @@
 {
    bug_23416
    Memcheck:Leak
-   fun:_Znwm
+   fun:_Znw*
    fun:_ZN11webkit_glue16WebURLLoaderImplC2Ev
    ...
    fun:_ZN11webkit_glue20ImageResourceFetcherC1ERK4GURLPN6WebKit8WebFrameEiiP14CallbackRunnerI6Tuple2IPS0_RK8SkBitmapEE