comparison src/share/vm/classfile/vmSymbols.hpp @ 13453:e3ec81d3e976

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 11:35:04 +0100
parents 02f27ecb4f3a e8c4a6ea3f77
children 4e679d50ba9a
comparison
equal deleted inserted replaced
13452:8275a0d0c90a 13453:e3ec81d3e976
366 template(createResolvedJavaMethod_name, "createResolvedJavaMethod") \ 366 template(createResolvedJavaMethod_name, "createResolvedJavaMethod") \
367 template(createResolvedJavaMethod_signature, "(Lcom/oracle/graal/api/meta/JavaType;J)Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \ 367 template(createResolvedJavaMethod_signature, "(Lcom/oracle/graal/api/meta/JavaType;J)Lcom/oracle/graal/api/meta/ResolvedJavaMethod;") \
368 template(createUnresolvedJavaType_name, "createUnresolvedJavaType") \ 368 template(createUnresolvedJavaType_name, "createUnresolvedJavaType") \
369 template(createUnresolvedJavaType_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \ 369 template(createUnresolvedJavaType_signature, "(Ljava/lang/String;)Lcom/oracle/graal/api/meta/JavaType;") \
370 template(createResolvedJavaType_name, "createResolvedJavaType") \ 370 template(createResolvedJavaType_name, "createResolvedJavaType") \
371 template(createResolvedJavaType_signature, "(JLjava/lang/String;Ljava/lang/String;Ljava/lang/Class;I)Lcom/oracle/graal/api/meta/ResolvedJavaType;") \ 371 template(createResolvedJavaType_signature, "(Ljava/lang/Class;)Lcom/oracle/graal/api/meta/ResolvedJavaType;") \
372 template(createPrimitiveJavaType_name, "createPrimitiveJavaType") \ 372 template(createPrimitiveJavaType_name, "createPrimitiveJavaType") \
373 template(createPrimitiveJavaType_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \ 373 template(createPrimitiveJavaType_signature, "(I)Lcom/oracle/graal/api/meta/JavaType;") \
374 template(getVMToCompiler_name, "getVMToCompiler") \ 374 template(getVMToCompiler_name, "getVMToCompiler") \
375 template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \ 375 template(getVMToCompiler_signature, "()Lcom/oracle/graal/hotspot/bridge/VMToCompiler;") \
376 template(runtime_name, "runtime") \ 376 template(runtime_name, "runtime") \