comparison src/share/vm/classfile/systemDictionary.hpp @ 15169:0ba58961ba14

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Apr 2014 19:00:14 +0200
parents 2c940b1a48d8 6876a4599b7e
children 29e8926ac631
comparison
equal deleted inserted replaced
15168:78530cbd8940 15169:0ba58961ba14
184 do_klass(Long_klass, java_lang_Long, Pre ) \ 184 do_klass(Long_klass, java_lang_Long, Pre ) \
185 \ 185 \
186 /* Support for Graal */ \ 186 /* Support for Graal */ \
187 do_klass(CompilerThread_klass, com_oracle_graal_compiler_CompilerThread, Opt) \ 187 do_klass(CompilerThread_klass, com_oracle_graal_compiler_CompilerThread, Opt) \
188 do_klass(BitSet_klass, java_util_BitSet, Opt) \ 188 do_klass(BitSet_klass, java_util_BitSet, Opt) \
189 /* graal.graph */ \
190 do_klass(Node_klass, com_oracle_graal_graph_Node, Opt) \
191 do_klass(NodeClass_klass, com_oracle_graal_graph_NodeClass, Opt) \
189 /* graal.hotspot */ \ 192 /* graal.hotspot */ \
190 do_klass(HotSpotCompiledCode_klass, com_oracle_graal_hotspot_HotSpotCompiledCode, Opt) \ 193 do_klass(HotSpotCompiledCode_klass, com_oracle_graal_hotspot_HotSpotCompiledCode, Opt) \
191 do_klass(HotSpotCompiledCode_Comment_klass, com_oracle_graal_hotspot_HotSpotCompiledCode_Comment, Opt) \ 194 do_klass(HotSpotCompiledCode_Comment_klass, com_oracle_graal_hotspot_HotSpotCompiledCode_Comment, Opt) \
192 do_klass(HotSpotCompiledNmethod_klass, com_oracle_graal_hotspot_HotSpotCompiledNmethod, Opt) \ 195 do_klass(HotSpotCompiledNmethod_klass, com_oracle_graal_hotspot_HotSpotCompiledNmethod, Opt) \
193 do_klass(HotSpotCompiledRuntimeStub_klass, com_oracle_graal_hotspot_HotSpotCompiledRuntimeStub, Opt) \ 196 do_klass(HotSpotCompiledRuntimeStub_klass, com_oracle_graal_hotspot_HotSpotCompiledRuntimeStub, Opt) \