Mercurial > hg > truffle
changeset 7419:3c433d080bae
Merge
author | twisti |
---|---|
date | Fri, 14 Dec 2012 12:11:17 -0800 |
parents | 5c0931d15474 (current diff) 1b1e16471e46 (diff) |
children | 18d56ca3e901 |
files | |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Fri Dec 14 12:06:42 2012 -0800 +++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Fri Dec 14 12:11:17 2012 -0800 @@ -434,7 +434,7 @@ // the frame is greater than one page in size, so check against // the bottom of the stack - __ cmp_and_brx_short(SP, Rscratch, Assembler::greater, Assembler::pt, after_frame_check); + __ cmp_and_brx_short(SP, Rscratch, Assembler::greaterUnsigned, Assembler::pt, after_frame_check); // the stack will overflow, throw an exception
--- a/src/share/vm/classfile/classLoaderData.cpp Fri Dec 14 12:06:42 2012 -0800 +++ b/src/share/vm/classfile/classLoaderData.cpp Fri Dec 14 12:11:17 2012 -0800 @@ -167,16 +167,18 @@ ok = (objArrayOop)ok->obj_at(1); } + // Must handle over GC points + assert (last != NULL, "dependencies should be initialized"); + objArrayHandle last_handle(THREAD, last); + // Create a new dependency node with fields for (class_loader or mirror, next) objArrayOop deps = oopFactory::new_objectArray(2, CHECK); deps->obj_at_put(0, dependency()); - // Must handle over more GC points + // Must handle over GC points objArrayHandle new_dependency(THREAD, deps); // Add the dependency under lock - assert (last != NULL, "dependencies should be initialized"); - objArrayHandle last_handle(THREAD, last); locked_add_dependency(last_handle, new_dependency); }