--- 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<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