8256738: Compiler interface clean-up

Reviewed-by: neliasso, kvn, thartmann

Author: cl4es

src/hotspot/share/ci/bcEscapeAnalyzer.hpp

@@ -63,7 +63,7 @@ class BCEscapeAnalyzer : public ResourceObj {
   bool              _allocated_escapes;
   bool              _unknown_modified;
 
-  GrowableArray<ciMetadata *> _dependencies;
+  GrowableArray<ciMetadata*> _dependencies;
 
   ciMethodBlocks   *_methodBlocks;
 

src/hotspot/share/ci/ciArray.hpp

@@ -41,12 +41,9 @@ class ciArray : public ciObject {
   int _length;
 
 protected:
-  ciArray(    arrayHandle h_a) : ciObject(h_a), _length(h_a()->length()) {}
   ciArray( objArrayHandle h_a) : ciObject(h_a), _length(h_a()->length()) {}
   ciArray(typeArrayHandle h_a) : ciObject(h_a), _length(h_a()->length()) {}
 
-  ciArray(ciKlass* klass, int len) : ciObject(klass), _length(len) {}
-
   arrayOop get_arrayOop() const { return (arrayOop)get_oop(); }
 
   const char* type_string() { return "ciArray"; }

src/hotspot/share/ci/ciCallProfile.hpp

@@ -43,15 +43,13 @@ class ciCallProfile : StackObj {
   int  _morphism;             // determined call site's morphism
   int  _count;                // # times has this call been executed
   int  _receiver_count[MorphismLimit + 1]; // # times receivers have been seen
-  ciMethod* _method[MorphismLimit + 1];    // receivers methods
   ciKlass*  _receiver[MorphismLimit + 1];  // receivers (exact)
 
   ciCallProfile() {
     _limit = 0;
     _morphism    = 0;
     _count = -1;
     _receiver_count[0] = -1;
-    _method[0]   = NULL;
     _receiver[0] = NULL;
   }
 
@@ -71,10 +69,6 @@ class ciCallProfile : StackObj {
     assert(i < _limit, "out of Call Profile MorphismLimit");
     return (float)_receiver_count[i]/(float)_count;
   }
-  ciMethod* method(int i)          {
-    assert(i < _limit, "out of Call Profile MorphismLimit");
-    return _method[i];
-  }
   ciKlass*  receiver(int i)        {
     assert(i < _limit, "out of Call Profile MorphismLimit");
     return _receiver[i];

src/hotspot/share/ci/ciCallSite.cpp

@@ -43,16 +43,6 @@ bool ciCallSite::is_fully_initialized_constant_call_site() {
   }
 }
 
-// ------------------------------------------------------------------
-// ciCallSite::get_target
-//
-// Return the target MethodHandle of this CallSite.
-ciMethodHandle* ciCallSite::get_target() const {
-  VM_ENTRY_MARK;
-  oop method_handle_oop = java_lang_invoke_CallSite::target(get_oop());
-  return CURRENT_ENV->get_object(method_handle_oop)->as_method_handle();
-}
-
 // ------------------------------------------------------------------
 // ciCallSite::print
 //

src/hotspot/share/ci/ciCallSite.hpp

@@ -42,9 +42,6 @@ class ciCallSite : public ciInstance {
 
   bool is_fully_initialized_constant_call_site();
 
-  // Return the target MethodHandle of this CallSite.
-  ciMethodHandle* get_target() const;
-
   void print();
 };
 

src/hotspot/share/ci/ciEnv.cpp

@@ -286,11 +286,9 @@ void ciEnv::cache_dtrace_flags() {
   // Need lock?
   _dtrace_extended_probes = ExtendedDTraceProbes;
   if (_dtrace_extended_probes) {
-    _dtrace_monitor_probes  = true;
     _dtrace_method_probes   = true;
     _dtrace_alloc_probes    = true;
   } else {
-    _dtrace_monitor_probes  = DTraceMonitorProbes;
     _dtrace_method_probes   = DTraceMethodProbes;
     _dtrace_alloc_probes    = DTraceAllocProbes;
   }
@@ -367,21 +365,6 @@ ciMethod* ciEnv::get_method_from_handle(Method* method) {
   return get_metadata(method)->as_method();
 }
 
-// ------------------------------------------------------------------
-// ciEnv::array_element_offset_in_bytes
-int ciEnv::array_element_offset_in_bytes(ciArray* a_h, ciObject* o_h) {
-  VM_ENTRY_MARK;
-  objArrayOop a = (objArrayOop)a_h->get_oop();
-  assert(a->is_objArray(), "");
-  int length = a->length();
-  oop o = o_h->get_oop();
-  for (int i = 0; i < length; i++) {
-    if (a->obj_at(i) == o)  return i;
-  }
-  return -1;
-}
-
-
 // ------------------------------------------------------------------
 // ciEnv::check_klass_accessiblity
 //
@@ -1127,14 +1110,6 @@ void ciEnv::register_method(ciMethod* target,
   }
 }
 
-
-// ------------------------------------------------------------------
-// ciEnv::find_system_klass
-ciKlass* ciEnv::find_system_klass(ciSymbol* klass_name) {
-  VM_ENTRY_MARK;
-  return get_klass_by_name_impl(NULL, constantPoolHandle(), klass_name, false);
-}
-
 // ------------------------------------------------------------------
 // ciEnv::comp_level
 int ciEnv::comp_level() {

src/hotspot/share/ci/ciEnv.hpp

@@ -78,7 +78,6 @@ class ciEnv : StackObj {
 
   // Cache DTrace flags
   bool  _dtrace_extended_probes;
-  bool  _dtrace_monitor_probes;
   bool  _dtrace_method_probes;
   bool  _dtrace_alloc_probes;
 
@@ -355,7 +354,6 @@ class ciEnv : StackObj {
   // Cache DTrace flags
   void  cache_dtrace_flags();
   bool  dtrace_extended_probes() const { return _dtrace_extended_probes; }
-  bool  dtrace_monitor_probes()  const { return _dtrace_monitor_probes; }
   bool  dtrace_method_probes()   const { return _dtrace_method_probes; }
   bool  dtrace_alloc_probes()    const { return _dtrace_alloc_probes; }
 
@@ -419,7 +417,6 @@ class ciEnv : StackObj {
   }
   ciInstance* unloaded_ciinstance();
 
-  ciKlass*  find_system_klass(ciSymbol* klass_name);
   // Note:  To find a class from its name string, use ciSymbol::make,
   // but consider adding to vmSymbols.hpp instead.
 
@@ -429,10 +426,6 @@ class ciEnv : StackObj {
   // array types into java/lang/Object and other types stay as they are.
   static ciInstanceKlass* get_instance_klass_for_declared_method_holder(ciKlass* klass);
 
-  // Return the machine-level offset of o, which must be an element of a.
-  // This may be used to form constant-loading expressions in lieu of simpler encodings.
-  int       array_element_offset_in_bytes(ciArray* a, ciObject* o);
-
   // Access to the compile-lifetime allocation arena.
   Arena*    arena() { return _arena; }
 

src/hotspot/share/ci/ciExceptionHandler.hpp

@@ -72,9 +72,6 @@ class ciExceptionHandler : public ResourceObj {
   bool      is_in_range(int bci) {
     return start() <= bci && bci < limit();
   }
-  bool      catches(ciInstanceKlass *exc) {
-    return is_catch_all() || exc->is_subtype_of(catch_klass());
-  }
   bool      is_rethrow() { return handler_bci() == -1; }
 
   void      print();

src/hotspot/share/ci/ciInstance.hpp

@@ -45,8 +45,6 @@ class ciInstance : public ciObject {
 
   ciInstance(ciKlass* klass) : ciObject(klass) {}
 
-  instanceOop get_instanceOop() { return (instanceOop)get_oop(); }
-
   const char* type_string() { return "ciInstance"; }
 
   void print_impl(outputStream* st);
@@ -61,7 +59,6 @@ class ciInstance : public ciObject {
 
   // What kind of ciObject is this?
   bool is_instance()     { return true; }
-  bool is_java_object()  { return true; }
 
   // Constant value of a field.
   ciConstant field_value(ciField* field);

src/hotspot/share/ci/ciKlass.cpp

@@ -122,16 +122,6 @@ ciKlass* ciKlass::super_of_depth(juint i) {
   return (super != NULL) ? CURRENT_THREAD_ENV->get_klass(super) : NULL;
 }
 
-// ------------------------------------------------------------------
-// ciKlass::can_be_primary_super
-bool ciKlass::can_be_primary_super() {
-  assert(is_loaded(), "must be loaded");
-
-  VM_ENTRY_MARK;
-  Klass* this_klass = get_Klass();
-  return this_klass->can_be_primary_super();
-}
-
 // ------------------------------------------------------------------
 // ciKlass::least_common_ancestor
 //