summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 21:49:14 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-20 21:49:14 +0000
commit9db08db3002dd85167577fabeee0cbe9d8361bed (patch)
tree3ec90ec0e400c480a469b9cd0c7f3060de191d13 /net/socket
parentd05c7872fad600928cf93ea53549814854d90269 (diff)
downloadchromium_src-9db08db3002dd85167577fabeee0cbe9d8361bed.zip
chromium_src-9db08db3002dd85167577fabeee0cbe9d8361bed.tar.gz
chromium_src-9db08db3002dd85167577fabeee0cbe9d8361bed.tar.bz2
Revert 118074 - Disable FPO throughout client_socket_pool_base.cc.
This will help track down the origin of a use-after-free bug. BUG=109876 Review URL: http://codereview.chromium.org/9240036 TBR=eroman@chromium.org Review URL: https://chromiumcodereview.appspot.com/9271013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/client_socket_pool_base.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index 6b2a75d..e67b4e7 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -22,14 +22,6 @@
using base::TimeDelta;
-// Disable FPO for all the functions in this file. This is to help track down
-// http://crbug.com/109876. With FPO enabled, the stacktrace capture is
-// unreliable, and we can't see the specific deletion point of the Group.
-// TODO(eroman): Remove it when done investigating.
-#if defined(COMPILER_MSVC)
-#pragma optimize("y", off)
-#endif
-
namespace {
// Indicate whether we should enable idle socket cleanup timer. When timer is
@@ -1263,8 +1255,3 @@ void ClientSocketPoolBaseHelper::Group::RemoveAllJobs() {
} // namespace internal
} // namespace net
-
-// Restore default optimization settings.
-#if defined(COMPILER_MSVC)
-#pragma optimize("", on)
-#endif