# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1296831684 -3600
# Node ID e5ba25730d9b609a35f10ac9933a0ff9af03a614
# Parent  91fe28b03d6a86b57d62b9a9da4010d172b42dd5
Sync with CRI changes.

diff -r 91fe28b03d6a -r e5ba25730d9b c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java	Wed Jan 26 18:17:37 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotConstantPool.java	Fri Feb 04 16:01:24 2011 +0100
@@ -20,7 +20,6 @@
  */
 package com.sun.hotspot.c1x;
 
-import java.lang.reflect.*;
 import java.util.*;
 
 import com.sun.cri.ri.*;
diff -r 91fe28b03d6a -r e5ba25730d9b c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Wed Jan 26 18:17:37 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Fri Feb 04 16:01:24 2011 +0100
@@ -107,6 +107,11 @@
     }
 
     @Override
+    public boolean noSafepoints() {
+        return false;
+    }
+
+    @Override
     public boolean isResolved() {
         return true;
     }
diff -r 91fe28b03d6a -r e5ba25730d9b c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Wed Jan 26 18:17:37 2011 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Fri Feb 04 16:01:24 2011 +0100
@@ -108,6 +108,11 @@
     }
 
     @Override
+    public boolean noSafepoints() {
+        return false;
+    }
+
+    @Override
     public CiBitMap[] livenessMap() {
         return null;
     }