--- a/indy-c1-x86-6919934.patch Tue Mar 09 22:10:19 2010 +0100
+++ b/indy-c1-x86-6919934.patch Thu Mar 11 13:04:44 2010 +0100
@@ -1058,10 +1058,10 @@ diff --git a/src/share/vm/c1/c1_IR.hpp b
// reexecute allowed only for the topmost frame
bool reexecute = topmost ? should_reexecute() : false;
- bool is_method_handle_invoke = false;
- recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, is_method_handle_invoke, locvals, expvals, monvals);
- }
- };
-@@ -302,7 +301,7 @@
+ bool return_oop = false; // This flag will be ignored since it used only for C2 with escape analysis.
+ recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
+ }
+@@ -303,7 +302,7 @@
int bci() const { return _bci; }
void add_register_oop(LIR_Opr opr);
@@ -1513,7 +1513,7 @@ diff --git a/src/share/vm/includeDB_core
diff --git a/src/share/vm/includeDB_core b/src/share/vm/includeDB_core
--- a/src/share/vm/includeDB_core
+++ b/src/share/vm/includeDB_core
-@@ -539,6 +539,7 @@
+@@ -540,6 +540,7 @@
ciCPCache.cpp cpCacheOop.hpp
ciCPCache.cpp ciCPCache.hpp
@@ -1603,7 +1603,7 @@ diff --git a/src/share/vm/runtime/shared
if (t == NULL) {
tty->print_cr("MISSING EXCEPTION HANDLER for pc " INTPTR_FORMAT " and handler bci %d", ret_pc, handler_bci);
tty->print_cr(" Exception:");
-@@ -889,12 +884,13 @@
+@@ -892,12 +887,13 @@
RegisterMap cbl_map(thread, false);
frame caller_frame = thread->last_frame().sender(&cbl_map);
@@ -1620,7 +1620,7 @@ diff --git a/src/share/vm/runtime/shared
// determine call info & receiver
-@@ -926,6 +922,13 @@
+@@ -929,6 +925,13 @@
}
#endif
@@ -1634,7 +1634,7 @@ diff --git a/src/share/vm/runtime/shared
// Compute entry points. This might require generation of C2I converter
// frames, so we cannot be holding any locks here. Furthermore, the
// computation of the entry points is independent of patching the call. We
-@@ -937,13 +940,12 @@
+@@ -940,13 +943,12 @@
StaticCallInfo static_call_info;
CompiledICInfo virtual_call_info;
--- a/series Tue Mar 09 22:10:19 2010 +0100
+++ b/series Thu Mar 11 13:04:44 2010 +0100
@@ -1,17 +1,17 @@
-# base = d3ab6707ff98 in http://hg.openjdk.java.net/bsd-port/bsd-port/hotspot [2010-02-19]
+# base = 32ebb1c95eca in http://hg.openjdk.java.net/bsd-port/bsd-port/hotspot [2010-03-08]
# Let's try using bsd-port as a patch base, since it works with all of Solaris, Linux, Windows, Mac/BSD.
snowleopard.patch #-/snowleopard #+gcc42
-#empty meth.patch #-/meth #+d3ab6707ff98
+#empty meth.patch #-/meth #+32ebb1c95eca
# pushed to jdk7/hotspot-comp; will be deleted when they get to bsd-port:
# review pending before push to hotspot-comp:
-indy-c1-x86-6919934.patch #-/indy #+d3ab6707ff98
+indy-c1-x86-6919934.patch #-/indy #+32ebb1c95eca
# need a bug ID to start review:
-dynopt-6912064.patch #-/dynopt #+d3ab6707ff98 #-testable
-indy-sparc-6829193.patch #-/indy #+d3ab6707ff98 #-testable
+dynopt-6912064.patch #-/dynopt #+32ebb1c95eca #-testable
+indy-sparc-6829193.patch #-/indy #+32ebb1c95eca #-testable
meth.proj.patch #-/meth #+projects
anonk.proj.patch #-/anonk #+projects
@@ -19,9 +19,9 @@ anonk.proj.patch #-/anonk
# Keep these separate, for debugging and review:
annot.patch #+annot #-/annot #+d1605aabd0a1 #+jdk7-b30 #-testable
inti.patch #+inti #-/inti #+d1605aabd0a1 #+jdk7-b30 #-buildable
-callcc.patch #+callcc #+/meth #+/indy #-/callcc #+d3ab6707ff98 #-testable
+callcc.patch #+callcc #+/meth #+/indy #-/callcc #+32ebb1c95eca #-testable
tailc.patch #+tailc-lazy #-/tailc #-tailc-eager
tailc-eager.patch #+tailc-lazy #-/tailc #-tailc-lazy
hotswap.patch #+hotswap #-/hotswap
-coro.patch #+coro #+/meth #+/indy #+/callcc #+/inti #+/dynopt #+d3ab6707ff98 #-testable
\ No newline at end of file
+coro.patch #+coro #+/meth #+/indy #+/callcc #+/inti #+/dynopt #+32ebb1c95eca #-testable