truffle: src/share/vm/prims/jni.cpp comparison

comparison src/share/vm/prims/jni.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 21 Aug 2012 10:39:19 +0200
parents	120820e30baa d2a62e0f25eb
children	e522a00b91aa

comparison

equal deleted inserted replaced

-:fd8832ae511d
+:957c266d8bc5
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, 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.
 * questions.
 *
 */
 #include "precompiled.hpp"
+#include "classfile/altHashing.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "graal/graalVMToInterpreter.hpp"
 #endif
 #ifndef SERIALGC
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #endif // SERIALGC
+#include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/gcLocker.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.inline.hpp"
 #include "oops/instanceKlass.hpp"
 env, (char*) name, loaderRef, (char*) buf, bufLen);
 #endif /* USDT2 */
 jclass cls = NULL;
 DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls);
+TempNewSymbol class_name = NULL;
 // Since exceptions can be thrown, class initialization can take place
 // if name is NULL no check for class name in .class stream has to be made.
 if (name != NULL) {
 const int str_len = (int)strlen(name);
 if (str_len > Symbol::max_length()) {
 // It's impossible to create this class;  the name cannot fit
 // into the constant pool.
 THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name);
 }
-}
+class_name = SymbolTable::new_symbol(name, CHECK_NULL);
-TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD);
+}
 ResourceMark rm(THREAD);
 ClassFileStream st((u1*) buf, bufLen, NULL);
 Handle class_loader (THREAD, JNIHandles::resolve(loaderRef));
 if (UsePerfData && !class_loader.is_null()) {
 }
 oop s = JNIHandles::resolve_non_null(string);
 int s_len = java_lang_String::length(s);
 typeArrayOop s_value = java_lang_String::value(s);
 int s_offset = java_lang_String::offset(s);
-jchar* buf = NEW_C_HEAP_ARRAY(jchar, s_len + 1);  // add one for zero termination
+jchar* buf = NEW_C_HEAP_ARRAY(jchar, s_len + 1, mtInternal);  // add one for zero termination
 if (s_len > 0) {
 memcpy(buf, s_value->char_at_addr(s_offset), sizeof(jchar)*s_len);
 }
 buf[s_len] = 0;
 #ifndef USDT2
 HOTSPOT_JNI_GETSTRINGUTFCHARS_ENTRY(
 env, string, (uintptr_t *) isCopy);
 #endif /* USDT2 */
 oop java_string = JNIHandles::resolve_non_null(string);
 size_t length = java_lang_String::utf8_length(java_string);
-char* result = AllocateHeap(length + 1, "GetStringUTFChars");
+char* result = AllocateHeap(length + 1, mtInternal);
 java_lang_String::as_utf8_string(java_string, result, (int) length + 1);
 if (isCopy != NULL) *isCopy = JNI_TRUE;
 #ifndef USDT2
 DTRACE_PROBE1(hotspot_jni, GetStringUTFChars__return, result);
 #else /* USDT2 */
 /* Empty array: legal but useless, can't return NULL. \
 * Return a pointer to something useless. \
 * Avoid asserts in typeArrayOop. */ \
 result = (ElementType*)get_bad_address(); \
 } else { \
-result = NEW_C_HEAP_ARRAY(ElementType, len); \
+result = NEW_C_HEAP_ARRAY(ElementType, len, mtInternal); \
 /* copy the array to the c chunk */ \
 memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
 } \
 if (isCopy) *isCopy = JNI_TRUE; \
 DTRACE_PROBE1(hotspot_jni, Get##Result##ArrayElements__return, result);\
 /* Empty array: legal but useless, can't return NULL. \
 * Return a pointer to something useless. \
 * Avoid asserts in typeArrayOop. */ \
 result = (ElementType*)get_bad_address(); \
 } else { \
-result = NEW_C_HEAP_ARRAY(ElementType, len); \
+result = NEW_C_HEAP_ARRAY(ElementType, len, mtInternal); \
 /* copy the array to the c chunk */ \
 memcpy(result, a->Tag##_at_addr(0), sizeof(ElementType)*len); \
 } \
 if (isCopy) *isCopy = JNI_TRUE; \
 ReturnProbe; \
 if (ExecuteInternalVMTests) {
 tty->print_cr("Running internal VM tests");
 run_unit_test(arrayOopDesc::test_max_array_length());
 run_unit_test(CollectedHeap::test_is_in());
 run_unit_test(QuickSort::test_quick_sort());
+run_unit_test(AltHashing::test_alt_hash());
 tty->print_cr("All internal VM tests passed");
 }
 }
 #undef run_unit_test

Mercurial > hg > truffle

comparison src/share/vm/prims/jni.cpp @ 6275:957c266d8bc5