changeset 46336:676abd5f6407

Merge
author sspitsyn
date Fri, 17 Mar 2017 15:26:49 +0000
parents da075aa9241f cfbf22d1d4b3
children 307e52ec20cd
files
diffstat 1 files changed, 0 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/perfData.cpp	Fri Mar 17 08:19:05 2017 -0700
+++ b/hotspot/src/share/vm/runtime/perfData.cpp	Fri Mar 17 15:26:49 2017 +0000
@@ -213,18 +213,9 @@
 }
 
 void PerfLongVariant::sample() {
-
-  // JJJ - This should not happen.  Maybe the first sample is taken
-  // while the _sample_helper is being null'ed out.
-  // assert(_sample_helper != NULL || _sampled != NULL, "unexpected state");
-  if (_sample_helper == NULL) return;
-
   if (_sample_helper != NULL) {
     *(jlong*)_valuep = _sample_helper->take_sample();
   }
-  else if (_sampled != NULL) {
-    *(jlong*)_valuep = *_sampled;
-  }
 }
 
 PerfByteArray::PerfByteArray(CounterNS ns, const char* namep, Units u,