Mercurial > hg > graal-jvmci-8

changeset 22456:979584f92e68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use JVMCI_ONLY for single line changes
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Aug 2015 13:05:10 +0200
parents 7ad03bf3d4a9
children c2d49f9fbceb
files src/share/vm/interpreter/linkResolver.hpp
diffstat 1 files changed, 4 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.hpp	Mon Aug 24 11:06:40 2015 +0200
+++ b/src/share/vm/interpreter/linkResolver.hpp	Mon Aug 24 13:05:10 2015 +0200
@@ -125,13 +125,9 @@
 
  private:
   static void lookup_method_in_klasses          (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, bool checkpolymorphism, bool in_imethod_resolve, TRAPS);
-#if INCLUDE_JVMCI
- public:
-#endif
+ JVMCI_ONLY(public:) // Needed for CompilerToVM.resolveMethod()
   static void lookup_instance_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS);
-#if INCLUDE_JVMCI
- private:
-#endif
+ JVMCI_ONLY(private:)
   static void lookup_method_in_interfaces       (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS);
   static void lookup_polymorphic_method         (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature,
                                                  KlassHandle current_klass, Handle *appendix_result_or_null, Handle *method_type_result, TRAPS);
@@ -145,14 +141,10 @@
 
   static void linktime_resolve_static_method    (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
   static void linktime_resolve_special_method   (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
-#if INCLUDE_JVMCI
- public:
-#endif
+ JVMCI_ONLY(public:) // Needed for CompilerToVM.resolveMethod()
   static void linktime_resolve_virtual_method   (methodHandle &resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature,KlassHandle current_klass, bool check_access, TRAPS);
   static void linktime_resolve_interface_method (methodHandle& resolved_method, KlassHandle resolved_klass, Symbol* method_name, Symbol* method_signature, KlassHandle current_klass, bool check_access, TRAPS);
-#if INCLUDE_JVMCI
- private:
-#endif
+ JVMCI_ONLY(private:)
 
   static void runtime_resolve_special_method    (CallInfo& result, methodHandle resolved_method, KlassHandle resolved_klass, KlassHandle current_klass, bool check_access, TRAPS);
   static void runtime_resolve_virtual_method    (CallInfo& result, methodHandle resolved_method, KlassHandle resolved_klass, Handle recv, KlassHandle recv_klass, bool check_null_and_abstract, TRAPS);