Mercurial > hg > graal-jvmci-8
diff src/share/vm/classfile/vmSymbols.hpp @ 2492:4e5515d09314
Fixed merge issues.
- Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change)
- Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 22 Apr 2011 19:00:07 +0200 |
parents | 0654ee04b214 |
children | 6594e6d8bfe7 |
line wrap: on
line diff
--- a/src/share/vm/classfile/vmSymbols.hpp Fri Apr 22 15:30:53 2011 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Fri Apr 22 19:00:07 2011 +0200 @@ -308,7 +308,7 @@ template(createRiSignature_name, "createRiSignature") \ template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/sun/cri/ri/RiSignature;") \ template(createRiField_name, "createRiField") \ - template(createRiField_signature, "(Lcom/sun/cri/ri/RiType;Ljava/lang/String;Lcom/sun/cri/ri/RiType;I)Lcom/sun/cri/ri/RiField;") \ + template(createRiField_signature, "(Lcom/sun/cri/ri/RiType;Ljava/lang/String;Lcom/sun/cri/ri/RiType;II)Lcom/sun/cri/ri/RiField;") \ template(createRiType_name, "createRiType") \ template(createRiType_signature, "(JLjava/lang/String;)Lcom/sun/cri/ri/RiType;") \ template(createRiTypePrimitive_name, "createRiTypePrimitive") \