# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1299576385 -3600
# Node ID f58974bce9bdff1b2c9d9c32d7184f6c30027271
# Parent  360497545e85652c7cd8bd2b53efa39ac0ba6697
Up-to-date with CRI changes.

diff -r 360497545e85 -r f58974bce9bd c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotExceptionHandler.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotExceptionHandler.java	Thu Mar 03 19:30:55 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotExceptionHandler.java	Tue Mar 08 10:26:25 2011 +0100
@@ -46,7 +46,7 @@
     }
 
     @Override
-    public int catchClassIndex() {
+    public int catchTypeCPI() {
         return catchClassIndex;
     }
 
@@ -56,7 +56,7 @@
     }
 
     @Override
-    public RiType catchKlass() {
+    public RiType catchType() {
         return catchClass;
     }
 
diff -r 360497545e85 -r f58974bce9bd c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Thu Mar 03 19:30:55 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Tue Mar 08 10:26:25 2011 +0100
@@ -184,4 +184,9 @@
     public int intrinsic() {
         return 0;
     }
+
+    @Override
+    public boolean minimalDebugInfo() {
+        return false;
+    }
 }
diff -r 360497545e85 -r f58974bce9bd c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Thu Mar 03 19:30:55 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Tue Mar 08 10:26:25 2011 +0100
@@ -132,6 +132,11 @@
         throw unresolved("exceptionHandlers");
     }
 
+    @Override
+    public boolean minimalDebugInfo() {
+        throw unresolved("minimalDebugInfo");
+    }
+
     private CiUnresolvedException unresolved(String operation) {
         return new CiUnresolvedException(operation + " not defined for unresolved method " + name);
     }