comparison c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotField.java @ 2289:6190d20bd6d6

merge
author Lukas Stadler <lukas.stadler@jku.at>
date Mon, 11 Apr 2011 11:25:06 +0200
parents 569d3fe7d65c f21664b3dd1c
children 160aacf936ad
comparison
equal deleted inserted replaced
2288:8c426c2891c8 2289:6190d20bd6d6
55 // TODO Auto-generated method stub 55 // TODO Auto-generated method stub
56 return 0; 56 return 0;
57 } 57 }
58 58
59 @Override 59 @Override
60 public CiConstant constantValue(Object object) { 60 public CiConstant constantValue(CiConstant receiver) {
61 if (object == null) { 61 if (receiver == null) {
62 if (constant == null && holder.isResolved() && holder.javaClass() == C1XOptions.class) { 62 if (constant == null && holder.isResolved() && holder.javaClass() == C1XOptions.class) {
63 Field f; 63 Field f;
64 try { 64 try {
65 f = C1XOptions.class.getField(name); 65 f = C1XOptions.class.getField(name);
66 } catch (SecurityException e1) { 66 } catch (SecurityException e1) {