Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 2491:0654ee04b214 | 2492:4e5515d09314 |
|---|---|
| 306 template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ | 306 template(createRiMethodUnresolved_name, "createRiMethodUnresolved") \ |
| 307 template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/sun/cri/ri/RiType;)Lcom/sun/cri/ri/RiMethod;") \ | 307 template(createRiMethodUnresolved_signature, "(Ljava/lang/String;Ljava/lang/String;Lcom/sun/cri/ri/RiType;)Lcom/sun/cri/ri/RiMethod;") \ |
| 308 template(createRiSignature_name, "createRiSignature") \ | 308 template(createRiSignature_name, "createRiSignature") \ |
| 309 template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/sun/cri/ri/RiSignature;") \ | 309 template(createRiSignature_signature, "(Ljava/lang/String;)Lcom/sun/cri/ri/RiSignature;") \ |
| 310 template(createRiField_name, "createRiField") \ | 310 template(createRiField_name, "createRiField") \ |
| 311 template(createRiField_signature, "(Lcom/sun/cri/ri/RiType;Ljava/lang/String;Lcom/sun/cri/ri/RiType;I)Lcom/sun/cri/ri/RiField;") \ | 311 template(createRiField_signature, "(Lcom/sun/cri/ri/RiType;Ljava/lang/String;Lcom/sun/cri/ri/RiType;II)Lcom/sun/cri/ri/RiField;") \ |
| 312 template(createRiType_name, "createRiType") \ | 312 template(createRiType_name, "createRiType") \ |
| 313 template(createRiType_signature, "(JLjava/lang/String;)Lcom/sun/cri/ri/RiType;") \ | 313 template(createRiType_signature, "(JLjava/lang/String;)Lcom/sun/cri/ri/RiType;") \ |
| 314 template(createRiTypePrimitive_name, "createRiTypePrimitive") \ | 314 template(createRiTypePrimitive_name, "createRiTypePrimitive") \ |
| 315 template(createRiTypePrimitive_signature, "(I)Lcom/sun/cri/ri/RiType;") \ | 315 template(createRiTypePrimitive_signature, "(I)Lcom/sun/cri/ri/RiType;") \ |
| 316 template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ | 316 template(createRiTypeUnresolved_name, "createRiTypeUnresolved") \ |