Mercurial > hg > graal-jvmci-8
comparison graal/Runtime/src/com/sun/hotspot/c1x/HotSpotConstantPool.java @ 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 | 099e697d8934 |
| children |
comparison
equal
deleted
inserted
replaced
| 2491:0654ee04b214 | 2492:4e5515d09314 |
|---|---|
| 21 package com.sun.hotspot.c1x; | 21 package com.sun.hotspot.c1x; |
| 22 | 22 |
| 23 import java.io.*; | 23 import java.io.*; |
| 24 import java.util.*; | 24 import java.util.*; |
| 25 | 25 |
| 26 import com.sun.c1x.debug.*; | |
| 26 import com.sun.cri.ri.*; | 27 import com.sun.cri.ri.*; |
| 27 | 28 |
| 28 /** | 29 /** |
| 29 * Implementation of RiConstantPool for HotSpot. | 30 * Implementation of RiConstantPool for HotSpot. |
| 30 * | 31 * |