diff 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
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotField.java	Mon Apr 11 10:37:24 2011 +0200
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotField.java	Mon Apr 11 11:25:06 2011 +0200
@@ -57,8 +57,8 @@
     }
 
     @Override
-    public CiConstant constantValue(Object object) {
-        if (object == null) {
+    public CiConstant constantValue(CiConstant receiver) {
+        if (receiver == null) {
             if (constant == null && holder.isResolved() && holder.javaClass() == C1XOptions.class) {
                 Field f;
                 try {