src/share/vm/prims/whitebox.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1401,1412 ****
        : ClassLoaderData::the_null_class_loader_data();
  
    MetadataFactory::free_array(cld, (Array<u1>*)(uintptr_t)addr);
  WB_END
  
! WB_ENTRY(void, WB_DefineModule(JNIEnv* env, jobject o, jobject module, jstring version, jstring location,
!                                 jobjectArray packages))
    ResourceMark rm(THREAD);
  
    objArrayOop packages_oop = objArrayOop(JNIHandles::resolve(packages));
    objArrayHandle packages_h(THREAD, packages_oop);
    int num_packages = (packages_h == NULL ? 0 : packages_h->length());
--- 1401,1412 ----
        : ClassLoaderData::the_null_class_loader_data();
  
    MetadataFactory::free_array(cld, (Array<u1>*)(uintptr_t)addr);
  WB_END
  
! WB_ENTRY(void, WB_DefineModule(JNIEnv* env, jobject o, jobject module, jboolean is_open,
!                                 jstring version, jstring location, jobjectArray packages))
    ResourceMark rm(THREAD);
  
    objArrayOop packages_oop = objArrayOop(JNIHandles::resolve(packages));
    objArrayHandle packages_h(THREAD, packages_oop);
    int num_packages = (packages_h == NULL ? 0 : packages_h->length());
*** 1421,1431 ****
                    err_msg("Bad package name"));
        }
        pkgs[x] = java_lang_String::as_utf8_string(pkg_str);
      }
    }
!   Modules::define_module(module, version, location, (const char* const*)pkgs, num_packages, CHECK);
  WB_END
  
  WB_ENTRY(void, WB_AddModuleExports(JNIEnv* env, jobject o, jobject from_module, jstring package, jobject to_module))
    ResourceMark rm(THREAD);
    char* package_name = NULL;
--- 1421,1431 ----
                    err_msg("Bad package name"));
        }
        pkgs[x] = java_lang_String::as_utf8_string(pkg_str);
      }
    }
!   Modules::define_module(module, is_open, version, location, (const char* const*)pkgs, num_packages, CHECK);
  WB_END
  
  WB_ENTRY(void, WB_AddModuleExports(JNIEnv* env, jobject o, jobject from_module, jstring package, jobject to_module))
    ResourceMark rm(THREAD);
    char* package_name = NULL;
*** 1902,1912 ****
    {CC"getMethodData0",     CC"(Ljava/lang/reflect/Executable;)J",
                                                        (void*)&WB_GetMethodData      },
    {CC"getCodeBlob",        CC"(J)[Ljava/lang/Object;",(void*)&WB_GetCodeBlob        },
    {CC"getThreadStackSize", CC"()J",                   (void*)&WB_GetThreadStackSize },
    {CC"getThreadRemainingStackSize", CC"()J",          (void*)&WB_GetThreadRemainingStackSize },
!   {CC"DefineModule",       CC"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V",
                                                        (void*)&WB_DefineModule },
    {CC"AddModuleExports",   CC"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V",
                                                        (void*)&WB_AddModuleExports },
    {CC"AddReadsModule",     CC"(Ljava/lang/Object;Ljava/lang/Object;)V",
                                                        (void*)&WB_AddReadsModule },
--- 1902,1912 ----
    {CC"getMethodData0",     CC"(Ljava/lang/reflect/Executable;)J",
                                                        (void*)&WB_GetMethodData      },
    {CC"getCodeBlob",        CC"(J)[Ljava/lang/Object;",(void*)&WB_GetCodeBlob        },
    {CC"getThreadStackSize", CC"()J",                   (void*)&WB_GetThreadStackSize },
    {CC"getThreadRemainingStackSize", CC"()J",          (void*)&WB_GetThreadRemainingStackSize },
!   {CC"DefineModule",       CC"(Ljava/lang/Object;ZLjava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V",
                                                        (void*)&WB_DefineModule },
    {CC"AddModuleExports",   CC"(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)V",
                                                        (void*)&WB_AddModuleExports },
    {CC"AddReadsModule",     CC"(Ljava/lang/Object;Ljava/lang/Object;)V",
                                                        (void*)&WB_AddReadsModule },