--- old/src/hotspot/share/asm/assembler.hpp 2018-03-09 13:54:52.247843311 -0500 +++ new/src/hotspot/share/asm/assembler.hpp 2018-03-09 13:54:51.206211545 -0500 @@ -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; --- old/src/hotspot/share/asm/codeBuffer.hpp 2018-03-09 13:55:02.506435635 -0500 +++ new/src/hotspot/share/asm/codeBuffer.hpp 2018-03-09 13:55:01.549814241 -0500 @@ -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; --- old/src/hotspot/share/c1/c1_GraphBuilder.cpp 2018-03-09 13:55:12.182929206 -0500 +++ new/src/hotspot/share/c1/c1_GraphBuilder.cpp 2018-03-09 13:55:11.129441848 -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; --- old/src/hotspot/share/c1/c1_GraphBuilder.hpp 2018-03-09 13:55:22.245546421 -0500 +++ new/src/hotspot/share/c1/c1_GraphBuilder.hpp 2018-03-09 13:55:21.454785289 -0500 @@ -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 --- old/src/hotspot/share/c1/c1_Optimizer.hpp 2018-03-09 13:55:31.444620071 -0500 +++ new/src/hotspot/share/c1/c1_Optimizer.hpp 2018-03-09 13:55:30.583381466 -0500 @@ -29,7 +29,7 @@ #include "c1/c1_Instruction.hpp" #include "memory/allocation.hpp" -class Optimizer VALUE_OBJ_CLASS_SPEC { +class Optimizer { private: IR* _ir; --- old/src/hotspot/share/c1/c1_RangeCheckElimination.hpp 2018-03-09 13:55:40.510792998 -0500 +++ new/src/hotspot/share/c1/c1_RangeCheckElimination.hpp 2018-03-09 13:55:39.683287444 -0500 @@ -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 --- old/src/hotspot/share/ci/ciConstant.hpp 2018-03-09 13:55:50.099937312 -0500 +++ new/src/hotspot/share/ci/ciConstant.hpp 2018-03-09 13:55:49.032279058 -0500 @@ -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; --- old/src/hotspot/share/ci/ciFlags.hpp 2018-03-09 13:55:59.736049314 -0500 +++ new/src/hotspot/share/ci/ciFlags.hpp 2018-03-09 13:55:58.882504680 -0500 @@ -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; --- old/src/hotspot/share/ci/ciTypeFlow.hpp 2018-03-09 13:56:09.111823165 -0500 +++ new/src/hotspot/share/ci/ciTypeFlow.hpp 2018-03-09 13:56:08.226974338 -0500 @@ -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; --- old/src/hotspot/share/code/codeBlob.hpp 2018-03-09 13:56:18.820005894 -0500 +++ new/src/hotspot/share/code/codeBlob.hpp 2018-03-09 13:56:17.821010446 -0500 @@ -82,7 +82,7 @@ class CodeBlobLayout; -class CodeBlob VALUE_OBJ_CLASS_SPEC { +class CodeBlob { friend class VMStructs; friend class JVMCIVMStructs; friend class CodeCacheDumper; --- old/src/hotspot/share/code/compiledMethod.hpp 2018-03-09 13:56:28.449433895 -0500 +++ new/src/hotspot/share/code/compiledMethod.hpp 2018-03-09 13:56:27.617427779 -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: --- old/src/hotspot/share/code/dependencies.hpp 2018-03-09 13:56:37.735294805 -0500 +++ new/src/hotspot/share/code/dependencies.hpp 2018-03-09 13:56:36.950013396 -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) --- old/src/hotspot/share/code/exceptionHandlerTable.hpp 2018-03-09 13:56:47.033925825 -0500 +++ new/src/hotspot/share/code/exceptionHandlerTable.hpp 2018-03-09 13:56:46.155935739 -0500 @@ -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; --- old/src/hotspot/share/code/location.hpp 2018-03-09 13:56:56.942130818 -0500 +++ new/src/hotspot/share/code/location.hpp 2018-03-09 13:56:56.007304282 -0500 @@ -40,7 +40,7 @@ // Where: [4] // Offset: [31..5] -class Location VALUE_OBJ_CLASS_SPEC { +class Location { friend class VMStructs; public: enum Where { --- old/src/hotspot/share/code/pcDesc.hpp 2018-03-09 13:57:06.303210063 -0500 +++ new/src/hotspot/share/code/pcDesc.hpp 2018-03-09 13:57:05.421812964 -0500 @@ -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 --- old/src/hotspot/share/code/relocInfo.hpp 2018-03-09 13:57:15.643841790 -0500 +++ new/src/hotspot/share/code/relocInfo.hpp 2018-03-09 13:57:14.747696292 -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; --- old/src/hotspot/share/code/stubs.hpp 2018-03-09 13:57:25.494108187 -0500 +++ new/src/hotspot/share/code/stubs.hpp 2018-03-09 13:57:24.608863731 -0500 @@ -57,7 +57,7 @@ // <--+ -class Stub VALUE_OBJ_CLASS_SPEC { +class Stub { public: // Initialization/finalization void initialize(int size, --- old/src/hotspot/share/compiler/abstractCompiler.hpp 2018-03-09 13:57:35.093316052 -0500 +++ new/src/hotspot/share/compiler/abstractCompiler.hpp 2018-03-09 13:57:34.095842103 -0500 @@ -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 --- old/src/hotspot/share/opto/block.hpp 2018-03-09 13:57:44.638294333 -0500 +++ new/src/hotspot/share/opto/block.hpp 2018-03-09 13:57:43.722424602 -0500 @@ -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 --- old/src/hotspot/share/opto/chaitin.hpp 2018-03-09 13:57:54.227612848 -0500 +++ new/src/hotspot/share/opto/chaitin.hpp 2018-03-09 13:57:53.340537797 -0500 @@ -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: --- old/src/hotspot/share/opto/indexSet.hpp 2018-03-09 13:58:03.429556623 -0500 +++ new/src/hotspot/share/opto/indexSet.hpp 2018-03-09 13:58:02.672067376 -0500 @@ -393,7 +393,7 @@ //-------------------------------- class IndexSetIterator -------------------- // An iterator for IndexSets. -class IndexSetIterator VALUE_OBJ_CLASS_SPEC { +class IndexSetIterator { friend class IndexSet; public: --- old/src/hotspot/share/opto/node.hpp 2018-03-09 13:58:12.841983709 -0500 +++ new/src/hotspot/share/opto/node.hpp 2018-03-09 13:58:12.000927425 -0500 @@ -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; --- old/src/hotspot/share/opto/optoreg.hpp 2018-03-09 13:58:22.778554672 -0500 +++ new/src/hotspot/share/opto/optoreg.hpp 2018-03-09 13:58:21.826142321 -0500 @@ -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: --- old/src/hotspot/share/opto/regmask.hpp 2018-03-09 13:58:32.016429997 -0500 +++ new/src/hotspot/share/opto/regmask.hpp 2018-03-09 13:58:31.153305306 -0500 @@ -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 --- old/src/hotspot/share/opto/replacednodes.hpp 2018-03-09 13:58:41.170519467 -0500 +++ new/src/hotspot/share/opto/replacednodes.hpp 2018-03-09 13:58:40.295364909 -0500 @@ -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; --- old/src/hotspot/share/opto/subnode.hpp 2018-03-09 13:58:50.418740040 -0500 +++ new/src/hotspot/share/opto/subnode.hpp 2018-03-09 13:58:49.625734418 -0500 @@ -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) {} --- old/src/hotspot/share/opto/superword.hpp 2018-03-09 13:58:59.901937729 -0500 +++ new/src/hotspot/share/opto/superword.hpp 2018-03-09 13:58:59.062784422 -0500 @@ -114,7 +114,7 @@ }; //------------------------------DepGraph--------------------------- -class DepGraph VALUE_OBJ_CLASS_SPEC { +class DepGraph { protected: Arena* _arena; GrowableArray _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