src/share/vm/runtime/vmStructs.cpp

@@ -206,10 +206,11 @@
 #include "opto/optoreg.hpp"
 #include "opto/parse.hpp"
 #include "opto/phaseX.hpp"
 #include "opto/regalloc.hpp"
 #include "opto/rootnode.hpp"
+#include "opto/shenandoahSupport.hpp"
 #include "opto/subnode.hpp"
 #include "opto/vectornode.hpp"
 #endif // COMPILER2
 
 // Note: the cross-product of (c1, c2, product, nonproduct, ...),

@@ -2074,10 +2075,14 @@
   declare_c2_type(OverflowMulINode, OverflowINode)                        \
   declare_c2_type(OverflowLNode, OverflowNode)                            \
   declare_c2_type(OverflowAddLNode, OverflowLNode)                        \
   declare_c2_type(OverflowSubLNode, OverflowLNode)                        \
   declare_c2_type(OverflowMulLNode, OverflowLNode)                        \
+  declare_c2_type(ShenandoahBarrierNode, TypeNode)                        \
+  declare_c2_type(ShenandoahReadBarrierNode, ShenandoahBarrierNode)       \
+  declare_c2_type(ShenandoahWriteBarrierNode, ShenandoahBarrierNode)      \
+  declare_c2_type(ShenandoahWBMemProjNode, ProjNode)                      \
                                                                           \
   /*********************/                                                 \
   /* Adapter Blob Entries */                                              \
   /*********************/                                                 \
   declare_toplevel_type(AdapterHandlerEntry)                              \

@@ -2255,10 +2260,11 @@
   declare_constant(BarrierSet::CardTableModRef)                           \
   declare_constant(BarrierSet::CardTableForRS)                            \
   declare_constant(BarrierSet::CardTableExtension)                        \
   declare_constant(BarrierSet::G1SATBCT)                                  \
   declare_constant(BarrierSet::G1SATBCTLogging)                           \
+  declare_constant(BarrierSet::ShenandoahBarrierSet)                      \
                                                                           \
   declare_constant(BlockOffsetSharedArray::LogN)                          \
   declare_constant(BlockOffsetSharedArray::LogN_words)                    \
   declare_constant(BlockOffsetSharedArray::N_bytes)                       \
   declare_constant(BlockOffsetSharedArray::N_words)                       \