Automatic merge of jdk:master into master

Author: duke

src/hotspot/share/runtime/timer.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,22 +47,6 @@ jlong TimeHelper::micros_to_counter(jlong micros) {
   return micros * freq;
 }
 
-elapsedTimer::elapsedTimer(jlong time, jlong timeUnitsPerSecond) {
-  _active = false;
-  jlong osTimeUnitsPerSecond = os::elapsed_frequency();
-  assert(osTimeUnitsPerSecond % 1000 == 0, "must be");
-  assert(timeUnitsPerSecond % 1000 == 0, "must be");
-  while (osTimeUnitsPerSecond < timeUnitsPerSecond) {
-    timeUnitsPerSecond /= 1000;
-    time *= 1000;
-  }
-  while (osTimeUnitsPerSecond > timeUnitsPerSecond) {
-    timeUnitsPerSecond *= 1000;
-    time /= 1000;
-  }
-  _counter = time;
-}
-
 void elapsedTimer::add(elapsedTimer t) {
   _counter += t._counter;
 }

src/hotspot/share/runtime/timer.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,6 @@ class elapsedTimer {
   bool  _active;
  public:
   elapsedTimer()             { _active = false; reset(); }
-  elapsedTimer(jlong time, jlong timeUnitsPerSecond);
   void add(elapsedTimer t);
   void start();
   void stop();