# HG changeset patch
# User Thomas Wuerthinger <wuerthinger@ssw.jku.at>
# Date 1290097695 -3600
# Node ID 243c729b5dede79cad6b86522a77caa99ff744e7
# Parent  2c754f3a2722449373de26c648acea508035d768# Parent  c0155c60b089c25fd11f27931ecab676a4bfb451
Merge.

diff -r 2c754f3a2722 -r 243c729b5ded c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Thu Nov 18 17:27:43 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Thu Nov 18 17:28:15 2010 +0100
@@ -125,8 +125,7 @@
         throw new UnsupportedOperationException("jniSymbol");
     }
 
-    @Override
-    public Object liveness(int bci) {
+    public CiBitMap[] livenessMap() {
         return null;
     }
 
diff -r 2c754f3a2722 -r 243c729b5ded c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Thu Nov 18 17:27:43 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Thu Nov 18 17:28:15 2010 +0100
@@ -115,8 +115,8 @@
     }
 
     @Override
-    public Object liveness(int bci) {
-        throw unresolved("liveness");
+    public CiBitMap[] livenessMap() {
+        return null;
     }
 
     @Override