diff -r 7be58576e71a -r 601146c66cad src/hotspot/share/runtime/timer.hpp
--- a/src/hotspot/share/runtime/timer.hpp	Fri Mar 09 08:01:25 2018 +0100
+++ b/src/hotspot/share/runtime/timer.hpp	Fri Mar 09 10:46:02 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -29,7 +29,7 @@
 
 // Timers for simple measurement.
 
-class elapsedTimer VALUE_OBJ_CLASS_SPEC {
+class elapsedTimer {
   friend class VMStructs;
  private:
   jlong _counter;
@@ -50,7 +50,7 @@
 };
 
 // TimeStamp is used for recording when an event took place.
-class TimeStamp VALUE_OBJ_CLASS_SPEC {
+class TimeStamp {
  private:
   jlong _counter;
  public: