Mercurial > hg > graal-jvmci-8

changeset 22450:a17e3063a7b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved SystemDictionary::jvmci_loader and SystemDictionary::init_jvmci_loader definitions to the header file
author Doug Simon <doug.simon@oracle.com>
date Fri, 21 Aug 2015 11:39:38 +0200
parents cfd7ebda543b
children 2229c0e4fe21
files src/share/vm/classfile/systemDictionary.cpp src/share/vm/classfile/systemDictionary.hpp
diffstat 2 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp	Fri Aug 21 11:33:48 2015 +0200
+++ b/src/share/vm/classfile/systemDictionary.cpp	Fri Aug 21 11:39:38 2015 +0200
@@ -98,14 +98,6 @@
 
 #if INCLUDE_JVMCI
 oop         SystemDictionary::_jvmci_loader               = NULL;
-
-oop SystemDictionary::jvmci_loader() {
-  return _jvmci_loader;
-}
-void SystemDictionary::init_jvmci_loader(oop loader) {
-  assert(UseJVMCIClassLoader == (loader != NULL), "must be");
-  _jvmci_loader = loader;
-}
 #endif
 
 // lazily initialized klass variables
--- a/src/share/vm/classfile/systemDictionary.hpp	Fri Aug 21 11:33:48 2015 +0200
+++ b/src/share/vm/classfile/systemDictionary.hpp	Fri Aug 21 11:39:38 2015 +0200
@@ -543,9 +543,13 @@
 #if INCLUDE_JVMCI
   // Returns the JVMCI loader. This will be NULL if !UseJVMCIClassLoader
   // in which case it's equivalent to the boot loader
-  static oop jvmci_loader();
+  static oop jvmci_loader()                 { return _jvmci_loader; }
+
   // Sets the JVMCI loader. This is called at most once.
-  static void init_jvmci_loader(oop loader);
+  static void init_jvmci_loader(oop loader) {
+    assert(UseJVMCIClassLoader == (loader != NULL), "must be");
+    _jvmci_loader = loader;
+  }
 #endif
 
   // Compute the default system loader