changeset 515:3e126536de3f

rebase to current hsx/hotspot-comp
author jrose
date Fri, 13 Sep 2013 22:46:24 -0700
parents 09506d69c8cb
children 4cd7d914b0e3
files coro-simple.patch series
diffstat 2 files changed, 10 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/coro-simple.patch	Tue Aug 13 00:50:02 2013 -0700
+++ b/coro-simple.patch	Fri Sep 13 22:46:24 2013 -0700
@@ -723,11 +723,10 @@
 diff --git a/src/share/vm/prims/jni.cpp b/src/share/vm/prims/jni.cpp
 --- a/src/share/vm/prims/jni.cpp
 +++ b/src/share/vm/prims/jni.cpp
-@@ -5132,6 +5132,28 @@
-     // Check if we should compile all classes on bootclasspath
-     NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
-     NOT_PRODUCT(if (ReplayCompiles) ciReplay::replay(thread);)
-+
+@@ -5132,6 +5132,27 @@
+     CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(execute_internal_vm_tests);
+ #endif
+ 
 +    JavaThread* __the_thread__ = thread;
 +    HandleMark hm(THREAD);
 +    Handle obj(THREAD, thread->threadObj());
--- a/series	Tue Aug 13 00:50:02 2013 -0700
+++ b/series	Fri Sep 13 22:46:24 2013 -0700
@@ -1,11 +1,11 @@
-# base = cd3d6a6b95d9 in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2012-11-30]
+# base = 01b268b3080a in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2013-09-13]
 
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
-anno-stable-8001107.patch       #-/meth #+cd3d6a6b95d9
-value-obj-8001111.patch         #-/meth #+cd3d6a6b95d9 #-testable
-meth.patch                      #-/meth #+cd3d6a6b95d9
+anno-stable-8001107.patch       #-/meth #+01b268b3080a #-testable
+value-obj-8001111.patch         #-/meth #+01b268b3080a #-testable
+meth.patch                      #-/meth #+01b268b3080a
 
 meth.proj.patch                 #-/meth #+projects
 anonk.proj.patch                #-/anonk #+projects
@@ -21,7 +21,7 @@
 hotswaplight.patch   #+hotswaplight       #-/hotswaplight
 
 # Coroutine patches: full version and simple version (no thread migration, no serialization, no stack sharing) 
-coro.patch                      #+coro          #(cd3d6a6b95d9)
-coro-simple.patch               #+coro-simple   #(cd3d6a6b95d9)
+coro.patch                      #+coro          #(01b268b3080a)
+coro-simple.patch               #+coro-simple   #(01b268b3080a)
 
 tuple-tsig.patch        #+tuple #-/tuple #-testable