diff graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotCodeCacheProvider.java @ 21538:c1e2fdb5fea3

removed more dependencies from JVMCI classes to non-JVMCI classes (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Mon, 25 May 2015 17:20:39 +0200
parents de0cf192779c
children
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotCodeCacheProvider.java	Mon May 25 17:09:00 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/jvmci/HotSpotCodeCacheProvider.java	Mon May 25 17:20:39 2015 +0200
@@ -38,9 +38,7 @@
 import com.oracle.graal.api.code.DataSection.Data;
 import com.oracle.graal.api.code.DataSection.DataBuilder;
 import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.*;
 import com.oracle.graal.debug.*;
-import com.oracle.graal.printer.*;
 
 /**
  * HotSpot implementation of {@link CodeCacheProvider}.
@@ -121,7 +119,7 @@
                     return (String) processMethod.invoke(null, hcfEmbeddedString);
                 } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
                     // If the tool is available, for now let's be noisy when it fails
-                    throw new GraalInternalError(e);
+                    throw new InternalError(e);
                 }
             }
             return hcfEmbeddedString;
@@ -281,7 +279,7 @@
                 compressed = meta.isCompressed();
                 raw = meta.rawValue();
             } else {
-                throw GraalInternalError.shouldNotReachHere();
+                throw new InternalError(String.valueOf(constant));
             }
 
             size = target.getSizeInBytes(compressed ? Kind.Int : target.wordKind);
@@ -306,7 +304,7 @@
             size = s.getSerializedSize();
             builder = DataBuilder.serializable(s);
         } else {
-            throw GraalInternalError.shouldNotReachHere();
+            throw new InternalError(String.valueOf(constant));
         }
 
         return new Data(size, size, builder);