--- a/src/share/vm/ci/ciEnv.hpp	Mon Dec 03 15:32:17 2012 +0100
+++ b/src/share/vm/ci/ciEnv.hpp	Mon Dec 03 17:54:05 2012 +0100
@@ -45,9 +45,6 @@
 
   friend class CompileBroker;
   friend class Dependencies;  // for get_object, during logging
-#ifdef GRAAL
-  friend class CodeInstaller;
-#endif
 
   static fileStream* _replay_data_stream;
 
@@ -105,8 +102,6 @@
   ciInstance* _the_null_string;      // The Java string "null"
   ciInstance* _the_min_jint_string; // The Java string "-2147483648"
 
-public:
-
   // Look up a klass by name from a particular class loader (the accessor's).
   // If require_local, result must be defined in that class loader, or NULL.
   // If !require_local, a result from remote class loader may be reported,
@@ -137,8 +132,6 @@
                                  int method_index, Bytecodes::Code bc,
                                  ciInstanceKlass* loading_klass);
 
-private:
-
   // Implementation methods for loading and constant pool access.
   ciKlass* get_klass_by_name_impl(ciKlass* accessing_klass,
                                   constantPoolHandle cpool,
@@ -166,7 +159,6 @@
                            Symbol*         sig,
                            Bytecodes::Code bc);
 
-  public:
   // Get a ciObject from the object factory.  Ensures uniqueness
   // of ciObjects.
   ciObject* get_object(oop o) {
@@ -176,7 +168,6 @@
       return _factory->get(o);
     }
   }
-  private:
 
   ciSymbol* get_symbol(Symbol* o) {
     if (o == NULL) {
@@ -362,7 +353,7 @@
   uint compile_id();  // task()->compile_id()
 
   // Register the result of a compilation.
-  nmethod* register_method(ciMethod*             target,
+  void register_method(ciMethod*                 target,
                        int                       entry_bci,
                        CodeOffsets*              offsets,
                        int                       orig_pc_offset,
@@ -430,10 +421,10 @@
   Arena*    arena() { return _arena; }
 
   // What is the current compilation environment?
-  static ciEnv* current() { return JavaThread::current()->env(); }
+  static ciEnv* current() { return CompilerThread::current()->env(); }
 
   // Overload with current thread argument
-  static ciEnv* current(JavaThread *thread) { return thread->env(); }
+  static ciEnv* current(CompilerThread *thread) { return thread->env(); }
 
   // Per-compiler data.  (Used by C2 to publish the Compile* pointer.)
   void* compiler_data() { return _compiler_data; }