stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7030300: more nightly failures after statics in Class changes

Browse Source 
Reviewed-by: iveresov, jcoomes, dcubed
This commit is contained in:
Tom Rodriguez 2011-03-23 10:55:43 -07:00
parent fe899cc10d
commit 87c2f53c25
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -746,7 +746,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
out.writeByte((byte)kind); out.writeByte((byte)kind);
if (ik != null) { if (ik != null) {
// static field // static field
writeField(field, ik); writeField(field, ik.getJavaMirror());
} }
} }
} }

2
hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
View File

@ -301,7 +301,7 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
// thread. // thread.
assert(_obj != noreg, "must be a valid register"); assert(_obj != noreg, "must be a valid register");
assert(_oop_index >= 0, "must have oop index"); assert(_oop_index >= 0, "must have oop index");
__ ld_ptr(_obj, java_lang_Class::klass_offset_in_bytes(), G3); __ load_heap_oop(_obj, java_lang_Class::klass_offset_in_bytes(), G3);
__ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3); __ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3);
__ cmp(G2_thread, G3); __ cmp(G2_thread, G3);
__ br(Assembler::notEqual, false, Assembler::pn, call_patch); __ br(Assembler::notEqual, false, Assembler::pn, call_patch);

2
hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
View File

@ -316,7 +316,7 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
Register tmp2 = rbx; Register tmp2 = rbx;
__ push(tmp); __ push(tmp);
__ push(tmp2); __ push(tmp2);
__ movptr(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes())); __ load_heap_oop(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
__ get_thread(tmp); __ get_thread(tmp);
__ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc))); __ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc)));
__ pop(tmp2); __ pop(tmp2);