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

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Apr 2014 19:00:14 +0200
parents 2c940b1a48d8 6876a4599b7e
children a20be10ad437
comparison
equal deleted inserted replaced
15168:78530cbd8940 15169:0ba58961ba14
290 template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \ 290 template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \
291 \ 291 \
292 /* Support for Graal */ \ 292 /* Support for Graal */ \
293 template(com_oracle_graal_compiler_CompilerThread, "com/oracle/graal/compiler/CompilerThread") \ 293 template(com_oracle_graal_compiler_CompilerThread, "com/oracle/graal/compiler/CompilerThread") \
294 template(java_util_BitSet, "java/util/BitSet") \ 294 template(java_util_BitSet, "java/util/BitSet") \
295 /* graal.graph */ \
296 template(com_oracle_graal_graph_Node, "com/oracle/graal/graph/Node") \
297 template(com_oracle_graal_graph_NodeClass, "com/oracle/graal/graph/NodeClass") \
295 /* graal.hotspot */ \ 298 /* graal.hotspot */ \
296 template(com_oracle_graal_hotspot_HotSpotGraalRuntime, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \ 299 template(com_oracle_graal_hotspot_HotSpotGraalRuntime, "com/oracle/graal/hotspot/HotSpotGraalRuntime") \
297 template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/HotSpotKlassOop") \ 300 template(com_oracle_graal_hotspot_HotSpotKlassOop, "com/oracle/graal/hotspot/HotSpotKlassOop") \
298 template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \ 301 template(com_oracle_graal_hotspot_HotSpotOptions, "com/oracle/graal/hotspot/HotSpotOptions") \
299 template(com_oracle_graal_hotspot_HotSpotCompiledCode, "com/oracle/graal/hotspot/HotSpotCompiledCode") \ 302 template(com_oracle_graal_hotspot_HotSpotCompiledCode, "com/oracle/graal/hotspot/HotSpotCompiledCode") \