changeset 49378:47b5652f2928

8199283: Remove ValueObj class for allocation subclassing for compiler code Reviewed-by: stefank, tschatzl
author coleenp
date Fri, 09 Mar 2018 20:01:38 -0500
parents 3bb8b00832d0
children 17d4481280f1
files src/hotspot/share/asm/assembler.hpp src/hotspot/share/asm/codeBuffer.hpp src/hotspot/share/c1/c1_GraphBuilder.cpp src/hotspot/share/c1/c1_GraphBuilder.hpp src/hotspot/share/c1/c1_Optimizer.hpp src/hotspot/share/c1/c1_RangeCheckElimination.hpp src/hotspot/share/ci/ciConstant.hpp src/hotspot/share/ci/ciFlags.hpp src/hotspot/share/ci/ciTypeFlow.hpp src/hotspot/share/code/codeBlob.hpp src/hotspot/share/code/compiledMethod.hpp src/hotspot/share/code/dependencies.hpp src/hotspot/share/code/exceptionHandlerTable.hpp src/hotspot/share/code/location.hpp src/hotspot/share/code/pcDesc.hpp src/hotspot/share/code/relocInfo.hpp src/hotspot/share/code/stubs.hpp src/hotspot/share/compiler/abstractCompiler.hpp src/hotspot/share/opto/block.hpp src/hotspot/share/opto/chaitin.hpp src/hotspot/share/opto/indexSet.hpp src/hotspot/share/opto/node.hpp src/hotspot/share/opto/optoreg.hpp src/hotspot/share/opto/regmask.hpp src/hotspot/share/opto/replacednodes.hpp src/hotspot/share/opto/subnode.hpp src/hotspot/share/opto/superword.hpp
diffstat 27 files changed, 62 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/asm/assembler.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/asm/assembler.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -71,7 +71,7 @@
  * Labels may only be used within a single CodeSection.  If you need
  * to create references between code sections, use explicit relocations.
  */
-class Label VALUE_OBJ_CLASS_SPEC {
+class Label {
  private:
   enum { PatchCacheSize = 4 };
 
@@ -171,7 +171,7 @@
 // A union type for code which has to assemble both constant and
 // non-constant operands, when the distinction cannot be made
 // statically.
-class RegisterOrConstant VALUE_OBJ_CLASS_SPEC {
+class RegisterOrConstant {
  private:
   Register _r;
   intptr_t _c;
--- a/src/hotspot/share/asm/codeBuffer.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/asm/codeBuffer.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -77,7 +77,7 @@
 // This class represents a stream of code and associated relocations.
 // There are a few in each CodeBuffer.
 // They are filled concurrently, and concatenated at the end.
-class CodeSection VALUE_OBJ_CLASS_SPEC {
+class CodeSection {
   friend class CodeBuffer;
  public:
   typedef int csize_t;  // code size type; would be size_t except for history
@@ -246,7 +246,7 @@
 };
 
 class CodeString;
-class CodeStrings VALUE_OBJ_CLASS_SPEC {
+class CodeStrings {
 private:
 #ifndef PRODUCT
   CodeString* _strings;
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp	Fri Mar 09 20:01:38 2018 -0500
@@ -41,7 +41,7 @@
 #include "runtime/vm_version.hpp"
 #include "utilities/bitMap.inline.hpp"
 
-class BlockListBuilder VALUE_OBJ_CLASS_SPEC {
+class BlockListBuilder {
  private:
   Compilation* _compilation;
   IRScope*     _scope;
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -35,7 +35,7 @@
 
 class MemoryBuffer;
 
-class GraphBuilder VALUE_OBJ_CLASS_SPEC {
+class GraphBuilder {
  private:
   // Per-scope data. These are pushed and popped as we descend into
   // inlined methods. Currently in order to generate good code in the
--- a/src/hotspot/share/c1/c1_Optimizer.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/c1/c1_Optimizer.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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 @@
 #include "c1/c1_Instruction.hpp"
 #include "memory/allocation.hpp"
 
-class Optimizer VALUE_OBJ_CLASS_SPEC {
+class Optimizer {
  private:
   IR* _ir;
 
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -34,7 +34,7 @@
 };
 
 // Implementation
-class RangeCheckEliminator VALUE_OBJ_CLASS_SPEC {
+class RangeCheckEliminator {
 private:
   int _number_of_instructions;
   bool _optimistic; // Insert predicates and deoptimize when they fail
--- a/src/hotspot/share/ci/ciConstant.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/ci/ciConstant.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -31,7 +31,7 @@
 // ciConstant
 //
 // This class represents a constant value.
-class ciConstant VALUE_OBJ_CLASS_SPEC {
+class ciConstant {
   friend class VMStructs;
 private:
   friend class ciEnv;
--- a/src/hotspot/share/ci/ciFlags.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/ci/ciFlags.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -34,7 +34,7 @@
 // ciFlags
 //
 // This class represents klass or method flags.
-class ciFlags VALUE_OBJ_CLASS_SPEC {
+class ciFlags {
 private:
   friend class ciInstanceKlass;
   friend class ciField;
--- a/src/hotspot/share/ci/ciTypeFlow.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -137,7 +137,7 @@
     void print_on(outputStream* st) const PRODUCT_RETURN;
   };
 
-  class LocalSet VALUE_OBJ_CLASS_SPEC {
+  class LocalSet {
   private:
     enum Constants { max = 63 };
     uint64_t _bits;
--- a/src/hotspot/share/code/codeBlob.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/codeBlob.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -82,7 +82,7 @@
 
 class CodeBlobLayout;
 
-class CodeBlob VALUE_OBJ_CLASS_SPEC {
+class CodeBlob {
   friend class VMStructs;
   friend class JVMCIVMStructs;
   friend class CodeCacheDumper;
--- a/src/hotspot/share/code/compiledMethod.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/compiledMethod.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -75,7 +75,7 @@
 class nmethod;
 
 // cache pc descs found in earlier inquiries
-class PcDescCache VALUE_OBJ_CLASS_SPEC {
+class PcDescCache {
   friend class VMStructs;
  private:
   enum { cache_size = 4 };
@@ -109,7 +109,7 @@
   PcDesc* scopes_pcs_end() const { return _upper; }
 };
 
-class PcDescContainer VALUE_OBJ_CLASS_SPEC {
+class PcDescContainer {
 private:
   PcDescCache _pc_desc_cache;
 public:
--- a/src/hotspot/share/code/dependencies.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/dependencies.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -204,7 +204,7 @@
 
 #if INCLUDE_JVMCI
   // A Metadata* or object value recorded in an OopRecorder
-  class DepValue VALUE_OBJ_CLASS_SPEC {
+  class DepValue {
    private:
     // Unique identifier of the value within the associated OopRecorder that
     // encodes both the category of the value (0: invalid, positive: metadata, negative: object)
--- a/src/hotspot/share/code/exceptionHandlerTable.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/exceptionHandlerTable.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -83,7 +83,7 @@
 // modified.
 
 class nmethod;
-class ExceptionHandlerTable VALUE_OBJ_CLASS_SPEC {
+class ExceptionHandlerTable {
  private:
   HandlerTableEntry* _table;    // the table
   int                _length;   // the current length of the table
@@ -140,7 +140,7 @@
 // Use 32-bit representation for offsets
 typedef  uint              implicit_null_entry;
 
-class ImplicitExceptionTable VALUE_OBJ_CLASS_SPEC {
+class ImplicitExceptionTable {
   uint _size;
   uint _len;
   implicit_null_entry *_data;
--- a/src/hotspot/share/code/location.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/location.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, 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
@@ -40,7 +40,7 @@
 //  Where:  [4]
 //  Offset: [31..5]
 
-class Location VALUE_OBJ_CLASS_SPEC {
+class Location {
   friend class VMStructs;
  public:
   enum Where {
--- a/src/hotspot/share/code/pcDesc.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/pcDesc.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -32,7 +32,7 @@
 
 class CompiledMethod;
 
-class PcDesc VALUE_OBJ_CLASS_SPEC {
+class PcDesc {
   friend class VMStructs;
  private:
   int _pc_offset;           // offset from start of nmethod
--- a/src/hotspot/share/code/relocInfo.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/relocInfo.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -252,7 +252,7 @@
 class CodeSection;
 class RelocIterator;
 
-class relocInfo VALUE_OBJ_CLASS_SPEC {
+class relocInfo {
   friend class RelocIterator;
  public:
   enum relocType {
@@ -469,7 +469,7 @@
 // Holder for flyweight relocation objects.
 // Although the flyweight subclasses are of varying sizes,
 // the holder is "one size fits all".
-class RelocationHolder VALUE_OBJ_CLASS_SPEC {
+class RelocationHolder {
   friend class Relocation;
   friend class CodeSection;
 
@@ -640,7 +640,7 @@
 // It represents the relocation data of relocation record.
 // So, the RelocIterator unpacks relocInfos into Relocations.
 
-class Relocation VALUE_OBJ_CLASS_SPEC {
+class Relocation {
   friend class RelocationHolder;
   friend class RelocIterator;
 
--- a/src/hotspot/share/code/stubs.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/code/stubs.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -57,7 +57,7 @@
 //                          <--+
 
 
-class Stub VALUE_OBJ_CLASS_SPEC {
+class Stub {
  public:
   // Initialization/finalization
   void    initialize(int size,
--- a/src/hotspot/share/compiler/abstractCompiler.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/compiler/abstractCompiler.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -33,10 +33,10 @@
 
 #if INCLUDE_JVMCI
 // Per-compiler statistics
-class CompilerStatistics VALUE_OBJ_CLASS_SPEC {
+class CompilerStatistics {
   friend class VMStructs;
 
-  class Data VALUE_OBJ_CLASS_SPEC {
+  class Data {
     friend class VMStructs;
   public:
     elapsedTimer _time;  // time spent compiling
--- a/src/hotspot/share/opto/block.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/block.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, 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
@@ -661,7 +661,7 @@
 
 //----------------------------BlockProbPair---------------------------
 // Ordered pair of Node*.
-class BlockProbPair VALUE_OBJ_CLASS_SPEC {
+class BlockProbPair {
 protected:
   Block* _target;      // block target
   double  _prob;        // probability of edge to block
--- a/src/hotspot/share/opto/chaitin.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/chaitin.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, 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
@@ -281,7 +281,7 @@
 // The LiveRangeMap class is responsible for storing node to live range id mapping.
 // Each node is mapped to a live range id (a virtual register). Nodes that are
 // not considered for register allocation are given live range id 0.
-class LiveRangeMap VALUE_OBJ_CLASS_SPEC {
+class LiveRangeMap {
 
 private:
 
--- a/src/hotspot/share/opto/indexSet.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/indexSet.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -393,7 +393,7 @@
 //-------------------------------- class IndexSetIterator --------------------
 // An iterator for IndexSets.
 
-class IndexSetIterator VALUE_OBJ_CLASS_SPEC {
+class IndexSetIterator {
  friend class IndexSet;
 
  public:
--- a/src/hotspot/share/opto/node.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/node.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, 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
@@ -1194,7 +1194,7 @@
 #if OPTO_DU_ITERATOR_ASSERT
 
 // Common code for assertion checking on DU iterators.
-class DUIterator_Common VALUE_OBJ_CLASS_SPEC {
+class DUIterator_Common {
 #ifdef ASSERT
  protected:
   bool         _vdui;               // cached value of VerifyDUIterators
@@ -1618,7 +1618,7 @@
 //-----------------------------Node_Notes--------------------------------------
 // Debugging or profiling annotations loosely and sparsely associated
 // with some nodes.  See Compile::node_notes_at for the accessor.
-class Node_Notes VALUE_OBJ_CLASS_SPEC {
+class Node_Notes {
   friend class VMStructs;
   JVMState* _jvms;
 
--- a/src/hotspot/share/opto/optoreg.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/optoreg.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -51,7 +51,7 @@
 // if the value is outside the enumeration's valid range. OptoReg::Name is
 // typedef'ed as int, because it needs to be able to represent spill-slots.
 //
-class OptoReg VALUE_OBJ_CLASS_SPEC {
+class OptoReg {
 
  friend class C2Compiler;
  public:
--- a/src/hotspot/share/opto/regmask.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/regmask.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, 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
@@ -62,7 +62,7 @@
 // However, it means the ADLC can redefine the unroll macro and all loops
 // over register masks will be unrolled by the correct amount.
 
-class RegMask VALUE_OBJ_CLASS_SPEC {
+class RegMask {
   union {
     double _dummy_force_double_alignment[RM_SIZE>>1];
     // Array of Register Mask bits.  This array is large enough to cover
--- a/src/hotspot/share/opto/replacednodes.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/replacednodes.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -41,9 +41,9 @@
 // replaced nodes are also merged. When parsing exits a method to
 // return to a caller, the replaced nodes on the exit path are used to
 // update the caller's map.
-class ReplacedNodes VALUE_OBJ_CLASS_SPEC {
+class ReplacedNodes {
  private:
-  class ReplacedNode VALUE_OBJ_CLASS_SPEC {
+  class ReplacedNode {
   private:
     Node* _initial;
     Node* _improved;
--- a/src/hotspot/share/opto/subnode.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/subnode.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, 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
@@ -279,7 +279,7 @@
 // Convert condition codes to a boolean test value (0 or -1).
 // We pick the values as 3 bits; the low order 2 bits we compare against the
 // condition codes, the high bit flips the sense of the result.
-struct BoolTest VALUE_OBJ_CLASS_SPEC {
+struct BoolTest {
   enum mask { eq = 0, ne = 4, le = 5, ge = 7, lt = 3, gt = 1, overflow = 2, no_overflow = 6, illegal = 8 };
   mask _test;
   BoolTest( mask btm ) : _test(btm) {}
--- a/src/hotspot/share/opto/superword.hpp	Fri Mar 09 13:36:39 2018 -0800
+++ b/src/hotspot/share/opto/superword.hpp	Fri Mar 09 20:01:38 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -114,7 +114,7 @@
 };
 
 //------------------------------DepGraph---------------------------
-class DepGraph VALUE_OBJ_CLASS_SPEC {
+class DepGraph {
  protected:
   Arena* _arena;
   GrowableArray<DepMem*> _map;
@@ -190,7 +190,7 @@
 
 // -----------------------------SWNodeInfo---------------------------------
 // Per node info needed by SuperWord
-class SWNodeInfo VALUE_OBJ_CLASS_SPEC {
+class SWNodeInfo {
  public:
   int         _alignment; // memory alignment for a node
   int         _depth;     // Max expression (DAG) depth from block start
@@ -222,7 +222,7 @@
 // JVMCI: OrderedPair is moved up to deal with compilation issues on Windows
 //------------------------------OrderedPair---------------------------
 // Ordered pair of Node*.
-class OrderedPair VALUE_OBJ_CLASS_SPEC {
+class OrderedPair {
  protected:
   Node* _p1;
   Node* _p2;
@@ -544,7 +544,7 @@
 
 //------------------------------SWPointer---------------------------
 // Information about an address for dependence checking and vector alignment
-class SWPointer VALUE_OBJ_CLASS_SPEC {
+class SWPointer {
  protected:
   MemNode*   _mem;           // My memory reference node
   SuperWord* _slp;           // SuperWord class