Mercurial > hg > truffle
changeset 1466:243c729b5ded
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Thu, 18 Nov 2010 17:28:15 +0100 |
parents | 2c754f3a2722 (current diff) c0155c60b089 (diff) |
children | c0de7306803c |
files | c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java |
diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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