Mercurial > hg > truffle

diff src/share/vm/runtime/thread.cpp @ 14405:438e13354adf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Fri, 19 Jul 2013 13:32:53 -0700
parents 583211d4b16b 71180a6e5080
children 94c202aa2646
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Thu Jul 11 12:56:29 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Fri Jul 19 13:32:53 2013 -0700
@@ -45,7 +45,6 @@
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "prims/privilegedStack.hpp"
-#include "runtime/aprofiler.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/deoptimization.hpp"
@@ -3680,7 +3679,6 @@
   }
 
   if (Arguments::has_profile())       FlatProfiler::engage(main_thread, true);
-  if (Arguments::has_alloc_profile()) AllocationProfiler::engage();
   if (MemProfiling)                   MemProfiler::engage();
   StatSampler::engage();
   if (CheckJNICalls)                  JniPeriodicChecker::engage();