Mercurial > hg > truffle
diff src/share/vm/runtime/vmStructs.cpp @ 6857:5876f980ea19
Merge
| author | collins |
|---|---|
| date | Fri, 12 Oct 2012 11:31:27 -0700 |
| parents | 9855b7e559ae d804e148cff8 |
| children | 685df3c6f84b |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp Fri Oct 12 10:49:39 2012 -0700 +++ b/src/share/vm/runtime/vmStructs.cpp Fri Oct 12 11:31:27 2012 -0700 @@ -463,6 +463,8 @@ static_field(Universe, _narrow_oop._base, address) \ static_field(Universe, _narrow_oop._shift, int) \ static_field(Universe, _narrow_oop._use_implicit_null_checks, bool) \ + static_field(Universe, _narrow_klass._base, address) \ + static_field(Universe, _narrow_klass._shift, int) \ \ /**********************************************************************************/ \ /* Generation and Space hierarchies */ \ @@ -1733,6 +1735,8 @@ declare_c2_type(CMoveNNode, CMoveNode) \ declare_c2_type(EncodePNode, TypeNode) \ declare_c2_type(DecodeNNode, TypeNode) \ + declare_c2_type(EncodePKlassNode, TypeNode) \ + declare_c2_type(DecodeNKlassNode, TypeNode) \ declare_c2_type(ConstraintCastNode, TypeNode) \ declare_c2_type(CastIINode, ConstraintCastNode) \ declare_c2_type(CastPPNode, ConstraintCastNode) \ @@ -1829,6 +1833,7 @@ declare_c2_type(StoreDNode, StoreNode) \ declare_c2_type(StorePNode, StoreNode) \ declare_c2_type(StoreNNode, StoreNode) \ + declare_c2_type(StoreNKlassNode, StoreNode) \ declare_c2_type(StoreCMNode, StoreNode) \ declare_c2_type(LoadPLockedNode, LoadPNode) \ declare_c2_type(SCMemProjNode, ProjNode) \