Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/javaClasses.cpp @ 23974:f13e777eb255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u111-b14
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 16 Nov 2016 12:32:54 -0800
parents dd9cc155639c efe013052465
children d4858e92c9b1
comparison
equal deleted inserted replaced
23792:3953f8820df8 23974:f13e777eb255
1 /* 1 /*
2 * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
940 940
941 void java_lang_Thread::compute_offsets() { 941 void java_lang_Thread::compute_offsets() {
942 assert(_group_offset == 0, "offsets should be initialized only once"); 942 assert(_group_offset == 0, "offsets should be initialized only once");
943 943
944 Klass* k = SystemDictionary::Thread_klass(); 944 Klass* k = SystemDictionary::Thread_klass();
945 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::char_array_signature()); 945 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature());
946 compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature()); 946 compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature());
947 compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature()); 947 compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature());
948 compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature()); 948 compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature());
949 compute_offset(_priority_offset, k, vmSymbols::priority_name(), vmSymbols::int_signature()); 949 compute_offset(_priority_offset, k, vmSymbols::priority_name(), vmSymbols::int_signature());
950 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature()); 950 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature());
970 void java_lang_Thread::set_thread(oop java_thread, JavaThread* thread) { 970 void java_lang_Thread::set_thread(oop java_thread, JavaThread* thread) {
971 java_thread->address_field_put(_eetop_offset, (address)thread); 971 java_thread->address_field_put(_eetop_offset, (address)thread);
972 } 972 }
973 973
974 974
975 typeArrayOop java_lang_Thread::name(oop java_thread) { 975 oop java_lang_Thread::name(oop java_thread) {
976 oop name = java_thread->obj_field(_name_offset); 976 return java_thread->obj_field(_name_offset);
977 assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); 977 }
978 return typeArrayOop(name); 978
979 } 979
980 980 void java_lang_Thread::set_name(oop java_thread, oop name) {
981
982 void java_lang_Thread::set_name(oop java_thread, typeArrayOop name) {
983 assert(java_thread->obj_field(_name_offset) == NULL, "name should be NULL");
984 java_thread->obj_field_put(_name_offset, name); 981 java_thread->obj_field_put(_name_offset, name);
985 } 982 }
986 983
987 984
988 ThreadPriority java_lang_Thread::priority(oop java_thread) { 985 ThreadPriority java_lang_Thread::priority(oop java_thread) {