changeset in /hg/icedtea: Merge with doko.
Andrew John Hughes
gnu_andrew at member.fsf.org
Thu Dec 4 06:11:31 PST 2008
changeset fa456dbffc04 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fa456dbffc04
description:
Merge with doko.
diffstat:
4 files changed, 377 insertions(+), 381 deletions(-)
ChangeLog | 11
Makefile.am | 4
patches/icedtea-shark.patch | 651 ++++++++++++++++++++-----------------------
patches/icedtea-zero.patch | 92 +++---
diffs (truncated from 919 to 500 lines):
diff -r 7a0ac0efdfe9 -r fa456dbffc04 ChangeLog
--- a/ChangeLog Thu Dec 04 12:36:04 2008 +0000
+++ b/ChangeLog Thu Dec 04 14:09:57 2008 +0000
@@ -105,6 +105,14 @@ 2008-12-03 Matthias Klose <doko at ubuntu
* Makefile.am (ZERO_PATCHES, ICEDTEA_PATCHES): Fix patch order.
* patches/icedtea-hotspot7-build-fixes.patch: Restore.
+
+2008-12-03 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-shark-build.patch: Regenerate.
+ * patches/icedtea-shark.patch: Regenerate.
+ * patches/icedtea-zero.patch: Regenerate.
+ * patches/icedtea-hotspot7-build-fixes.patch: Remove.
+ * Makefile.am (ZERO_PATCHES): Remove icedtea-hotspot7-build-fixes.patch.
2008-12-03 Matthias Klose <doko at ubuntu.com>
@@ -324,6 +332,9 @@ 2008-12-03 Gary Benson <gbenson at redhat
(os::is_allocatable): Likewise.
2008-12-03 Matthias Klose <doko at ubuntu.com>
+=======
+2008-12-02 Matthias Klose <doko at ubuntu.com>
+>>>>>>> other
* patches/icedtea-format-warnings.patch: New.
* patches/icedtea-format-warnings.patch: Likewise.
diff -r 7a0ac0efdfe9 -r fa456dbffc04 Makefile.am
--- a/Makefile.am Thu Dec 04 12:36:04 2008 +0000
+++ b/Makefile.am Thu Dec 04 14:09:57 2008 +0000
@@ -1874,6 +1874,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-display-mode-changer.patch \
patches/icedtea-testenv.patch \
patches/icedtea-format-warnings.patch \
+<<<<<<< local
patches/icedtea-fortify-source.patch \
$(ZERO_PATCHES_COND) \
patches/icedtea-samejvm-safe.patch \
@@ -1887,6 +1888,9 @@ ICEDTEA_PATCHES = \
patches/security/icedtea-6734167.patch \
patches/security/icedtea-6755943.patch \
patches/security/icedtea-6766136.patch
+=======
+ $(ZERO_PATCHES_COND)
+>>>>>>> other
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 7a0ac0efdfe9 -r fa456dbffc04 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch Thu Dec 04 12:36:04 2008 +0000
+++ b/patches/icedtea-shark.patch Thu Dec 04 14:09:57 2008 +0000
@@ -1,87 +1,208 @@ diff -ru openjdk/hotspot/src/share/vm/ci
-diff -ru openjdk/hotspot/src/share/vm/ci/ciMethod.cpp openjdk/hotspot/src/share/vm/ci/ciMethod.cpp
---- openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2008-06-20 10:22:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2008-05-19 12:00:23.000000000 +0100
-@@ -56,9 +56,9 @@
- _liveness = NULL;
- _bcea = NULL;
- _method_blocks = NULL;
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- _flow = NULL;
--#endif // COMPILER2
-+#endif // COMPILER2 || SHARK
-
- if (JvmtiExport::can_hotswap_or_post_breakpoint() && _is_compilable) {
- // 6328518 check hotswap conditions under the right lock.
-@@ -124,9 +124,9 @@
- _bcea = NULL;
- _method_blocks = NULL;
- _method_data = NULL;
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- _flow = NULL;
--#endif // COMPILER2
-+#endif // COMPILER2 || SHARK
- }
-
-
-@@ -294,34 +294,34 @@
- // ------------------------------------------------------------------
- // ciMethod::get_flow_analysis
- ciTypeFlow* ciMethod::get_flow_analysis() {
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- if (_flow == NULL) {
- ciEnv* env = CURRENT_ENV;
- _flow = new (env->arena()) ciTypeFlow(env, this);
- _flow->do_flow();
- }
- return _flow;
+--- openjdk/hotspot/src/share/vm/oops/methodOop.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -727,10 +727,14 @@
+ }
+
+ OrderAccess::storestore();
++#ifdef SHARK
++ mh->_from_interpreted_entry = code->instructions_begin();
++#else
+ mh->_from_compiled_entry = code->verified_entry_point();
+ OrderAccess::storestore();
+ // Instantly compiled code can execute.
+ mh->_from_interpreted_entry = mh->get_i2c_entry();
++#endif // SHARK
+
+ }
+
+--- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2008-12-03 14:33:48.000000000 +0000
+@@ -44,6 +44,7 @@
+ friend class VMStructs;
+ friend class CardTableRS;
+ friend class CheckForUnmarkedOops; // Needs access to raw card bytes.
++ friend class SharkBuilder;
+ #ifndef PRODUCT
+ // For debugging.
+ friend class GuaranteeNotModClosure;
+--- openjdk/hotspot/src/share/vm/runtime/globals.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -176,6 +176,18 @@
+ #define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 notproduct}", DEFAULT },
+ #endif
+
++#define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark product}", DEFAULT },
++#define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{Shark pd product}", DEFAULT },
++#define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark diagnostic}", DEFAULT },
++#ifdef PRODUCT
++ #define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
++ #define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
++ #define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
++#else
++ #define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark}", DEFAULT },
++ #define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{Shark pd}", DEFAULT },
++ #define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark notproduct}", DEFAULT },
++#endif
+
+ static Flag flagTable[] = {
+ RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
+@@ -189,6 +201,9 @@
+ #ifdef COMPILER2
+ C2_FLAGS(C2_DEVELOP_FLAG_STRUCT, C2_PD_DEVELOP_FLAG_STRUCT, C2_PRODUCT_FLAG_STRUCT, C2_PD_PRODUCT_FLAG_STRUCT, C2_DIAGNOSTIC_FLAG_STRUCT, C2_NOTPRODUCT_FLAG_STRUCT)
+ #endif
++#ifdef SHARK
++ SHARK_FLAGS(SHARK_DEVELOP_FLAG_STRUCT, SHARK_PD_DEVELOP_FLAG_STRUCT, SHARK_PRODUCT_FLAG_STRUCT, SHARK_PD_PRODUCT_FLAG_STRUCT, SHARK_DIAGNOSTIC_FLAG_STRUCT, SHARK_NOTPRODUCT_FLAG_STRUCT)
++#endif
+ {0, NULL, NULL}
+ };
+
+--- openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp 2008-12-03 14:33:49.000000000 +0000
+@@ -64,6 +64,11 @@
+ assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased");
+ BasicObjectLock* dest = _monitors->at(index);
+ dest->set_obj(monitor->owner());
++#ifdef SHARK
++ // XXX This can be removed when Shark knows
++ // which monitors are in use.
++ if (monitor->owner())
++#endif // SHARK
+ monitor->lock()->move_to(monitor->owner(), dest->lock());
+ }
+ }
+@@ -262,6 +267,11 @@
+ top = iframe()->previous_monitor_in_interpreter_frame(top);
+ BasicObjectLock* src = _monitors->at(index);
+ top->set_obj(src->obj());
++#ifdef SHARK
++ // XXX This can be removed when Shark knows
++ // which monitors are in use.
++ if (src->obj())
++#endif // SHARK
+ src->lock()->move_to(src->obj(), top->lock());
+ }
+ if (ProfileInterpreter) {
+--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-12-03 14:23:37.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -94,12 +94,16 @@
+ #ifdef TIERED
+ #define VMTYPE "Server"
+ #else
++#ifdef SHARK
++ #define VMTYPE "Shark"
++#else
+ #if defined(COMPILER1) || defined(COMPILER2)
+- #define VMTYPE COMPILER1_PRESENT("Client") \
+- COMPILER2_PRESENT("Server")
++ #define VMTYPE COMPILER1_PRESENT("Client") \
++ COMPILER2_PRESENT("Server")
+ #else
+ #define VMTYPE "Core"
+ #endif // COMPILER1 || COMPILER2
++#endif // SHARK
+ #endif // TIERED
+ #endif // KERNEL
+
+--- openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -229,6 +229,7 @@
+
+ }
+
++#ifndef SHARK
+ // Compute the caller frame based on the sender sp of stub_frame and stored frame sizes info.
+ CodeBlob* cb = stub_frame.cb();
+ // Verify we have the right vframeArray
+@@ -239,6 +240,10 @@
+ assert(cb->is_deoptimization_stub() || cb->is_uncommon_trap_stub(), "just checking");
+ Events::log("fetch unroll sp " INTPTR_FORMAT, unpack_sp);
+ #endif
++#else
++ intptr_t* unpack_sp = stub_frame.sender(&dummy_map).unextended_sp();
++#endif // !SHARK
++
+ // This is a guarantee instead of an assert because if vframe doesn't match
+ // we will unpack the wrong deoptimized frame and wind up in strange places
+ // where it will be very difficult to figure out what went wrong. Better
+@@ -349,7 +354,9 @@
+
+ frame_pcs[0] = deopt_sender.raw_pc();
+
++#ifndef SHARK
+ assert(CodeCache::find_blob_unsafe(frame_pcs[0]) != NULL, "bad pc");
++#endif // SHARK
+
+ UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord,
+ caller_adjustment * BytesPerWord,
+@@ -890,7 +897,20 @@
+ // stuff a C2I adapter we can properly fill in the callee-save
+ // register locations.
+ frame caller = fr.sender(reg_map);
++#ifdef ZERO
++ int frame_size;
++ {
++ // In zero, frame::sp() is the *end* of the frame, so
++ // caller.sp() - fr.sp() is the size of the *caller*.
++ RegisterMap dummy_map(thread, false);
++ frame frame_1 = thread->last_frame();
++ frame frame_2 = frame_1.sender(&dummy_map);
++ assert(frame_2.sp() == fr.sp(), "should be");
++ frame_size = frame_2.sp() - frame_1.sp();
++ }
++#else
+ int frame_size = caller.sp() - fr.sp();
++#endif // ZERO
+
+ frame sender = caller;
+
+@@ -1057,7 +1077,7 @@
+ JRT_END
+
+
+-#ifdef COMPILER2
++#if defined(COMPILER2) || defined(SHARK)
+ void Deoptimization::load_class_by_index(constantPoolHandle constant_pool, int index, TRAPS) {
+ // in case of an unresolved klass entry, load the class.
+ if (constant_pool->tag_at(index).is_unresolved_klass()) {
+@@ -1808,7 +1828,7 @@
+ if (xtty != NULL) xtty->tail("statistics");
+ }
+ }
-#else // COMPILER2
+#else // COMPILER2 || SHARK
- ShouldNotReachHere();
- return NULL;
--#endif // COMPILER2
-+#endif // COMPILER2 || SHARK
- }
-
-
- // ------------------------------------------------------------------
- // ciMethod::get_osr_flow_analysis
- ciTypeFlow* ciMethod::get_osr_flow_analysis(int osr_bci) {
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- // OSR entry points are always place after a call bytecode of some sort
- assert(osr_bci >= 0, "must supply valid OSR entry point");
- ciEnv* env = CURRENT_ENV;
- ciTypeFlow* flow = new (env->arena()) ciTypeFlow(env, this, osr_bci);
- flow->do_flow();
- return flow;
--#else // COMPILER2
-+#else // COMPILER2 || SHARK
- ShouldNotReachHere();
- return NULL;
--#endif // COMPILER2
-+#endif // COMPILER2 || SHARK
- }
-
- // ------------------------------------------------------------------
-diff -ru openjdk/hotspot/src/share/vm/ci/ciMethod.hpp openjdk/hotspot/src/share/vm/ci/ciMethod.hpp
---- openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2008-06-20 10:22:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2008-05-19 12:10:30.000000000 +0100
-@@ -69,7 +69,7 @@
-
- // Optional liveness analyzer.
- MethodLiveness* _liveness;
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- ciTypeFlow* _flow;
- #endif
-
-diff -ru openjdk/hotspot/src/share/vm/code/nmethod.cpp openjdk/hotspot/src/share/vm/code/nmethod.cpp
---- openjdk/hotspot/src/share/vm/code/nmethod.cpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2008-04-07 11:49:27.000000000 +0100
-@@ -66,6 +66,11 @@
+
+
+ // Stubs for C1 only system.
+@@ -1844,4 +1864,4 @@
+ return buf;
+ }
+
+-#endif // COMPILER2
++#endif // COMPILER2 || SHARK
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp.orig 2008-12-03 14:22:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp 2008-12-03 14:33:48.000000000 +0000
+@@ -22,7 +22,7 @@
+ *
+ */
+
+-#if !defined(COMPILER1) && !defined(COMPILER2)
++#if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK)
+ define_pd_global(bool, BackgroundCompilation, false);
+ define_pd_global(bool, UseTLAB, false);
+ define_pd_global(bool, CICompileOSR, false);
+--- openjdk/hotspot/src/share/vm/code/nmethod.hpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/code/nmethod.hpp 2008-12-03 14:33:48.000000000 +0000
+@@ -318,6 +318,7 @@
+
+ bool is_compiled_by_c1() const;
+ bool is_compiled_by_c2() const;
++ bool is_compiled_by_shark() const;
+
+ // boundaries for different parts
+ address code_begin () const { return _entry_point; }
+--- openjdk/hotspot/src/share/vm/code/nmethod.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -65,6 +65,11 @@
assert(compiler() != NULL, "must be");
return compiler()->is_c2();
}
@@ -93,29 +214,50 @@ diff -ru openjdk/hotspot/src/share/vm/co
-@@ -1883,6 +1888,8 @@
+@@ -1567,6 +1572,7 @@
+ // Method that knows how to preserve outgoing arguments at call. This method must be
+ // called with a frame corresponding to a Java invoke
+ void nmethod::preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) {
++#ifndef SHARK
+ if (!method()->is_native()) {
+ SimpleScopeDesc ssd(this, fr.pc());
+ Bytecode_invoke* call = Bytecode_invoke_at(ssd.method(), ssd.bci());
+@@ -1574,6 +1580,7 @@
+ symbolOop signature = call->signature();
+ fr.oops_compiled_arguments_do(signature, is_static, reg_map, f);
+ }
++#endif // !SHARK
+ }
+
+
+@@ -2003,6 +2010,8 @@
tty->print("(c1) ");
} else if (is_compiled_by_c2()) {
tty->print("(c2) ");
+ } else if (is_compiled_by_shark()) {
+ tty->print("(shark) ");
} else {
- assert(is_native_method(), "Who else?");
tty->print("(nm) ");
-diff -ru openjdk/hotspot/src/share/vm/code/nmethod.hpp openjdk/hotspot/src/share/vm/code/nmethod.hpp
---- openjdk/hotspot/src/share/vm/code/nmethod.hpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.hpp 2008-04-07 11:48:22.000000000 +0100
-@@ -290,6 +290,7 @@
-
- bool is_compiled_by_c1() const;
- bool is_compiled_by_c2() const;
-+ bool is_compiled_by_shark() const;
-
- // boundaries for different parts
- address code_begin () const { return _entry_point; }
-diff -ru openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp
---- openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2008-04-07 11:50:35.000000000 +0100
+ }
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -554,6 +554,14 @@
+ #endif
+ #endif // COMPILER2
+
++#ifdef SHARK
++#if defined(COMPILER1) || defined(COMPILER2)
++#error "Can't use COMPILER1 or COMPILER2 with shark"
++#endif
++ _compilers[0] = new SharkCompiler();
++ _compilers[1] = _compilers[0];
++#endif
++
+ // Initialize the CompileTask free list
+ _task_free_list = NULL;
+
+--- openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp 2008-12-03 14:33:48.000000000 +0000
@@ -45,18 +45,26 @@
// Missing feature tests
virtual bool supports_native() { return true; }
@@ -144,242 +286,81 @@ diff -ru openjdk/hotspot/src/share/vm/co
#endif // TIERED
// Customization
-diff -ru openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp
---- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2008-04-15 17:16:38.000000000 +0100
-@@ -554,6 +554,14 @@
- #endif
- #endif // COMPILER2
-
-+#ifdef SHARK
-+#if defined(COMPILER1) || defined(COMPILER2)
-+#error "Can't use COMPILER1 or COMPILER2 with shark"
-+#endif
-+ _compilers[0] = new SharkCompiler();
-+ _compilers[1] = _compilers[0];
-+#endif
-+
- // Initialize the CompileTask free list
- _task_free_list = NULL;
-
-diff -ru openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
---- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2008-05-06 10:43:55.000000000 +0100
-@@ -44,6 +44,7 @@
- friend class VMStructs;
- friend class CardTableRS;
- friend class CheckForUnmarkedOops; // Needs access to raw card bytes.
-+ friend class SharkBuilder;
- #ifndef PRODUCT
- // For debugging.
- friend class GuaranteeNotModClosure;
-diff -ru openjdk/hotspot/src/share/vm/oops/methodOop.cpp openjdk/hotspot/src/share/vm/oops/methodOop.cpp
---- openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2008-06-20 10:22:11.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp 2008-04-15 10:52:44.000000000 +0100
-@@ -730,10 +730,14 @@ void methodOopDesc::set_code(methodHandl
- }
-
- OrderAccess::storestore();
-+#ifdef SHARK
-+ mh->_from_interpreted_entry = code->instructions_begin();
-+#else
- mh->_from_compiled_entry = code->verified_entry_point();
- OrderAccess::storestore();
- // Instantly compiled code can execute.
- mh->_from_interpreted_entry = mh->get_i2c_entry();
-+#endif // SHARK
-
- }
-
-diff -ru openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp
---- openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-06-20 10:22:12.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp 2008-05-19 13:19:54.000000000 +0100
-@@ -999,7 +999,7 @@
- JRT_END
-
-
--#ifdef COMPILER2
-+#if defined(COMPILER2) || defined(SHARK)
- void Deoptimization::load_class_by_index(constantPoolHandle constant_pool, int index, TRAPS) {
- // in case of an unresolved klass entry, load the class.
- if (constant_pool->tag_at(index).is_unresolved_klass()) {
-@@ -1750,7 +1750,7 @@
- if (xtty != NULL) xtty->tail("statistics");
- }
- }
+--- openjdk/hotspot/src/share/vm/ci/ciMethod.hpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp 2008-12-03 14:33:48.000000000 +0000
+@@ -69,7 +69,7 @@
+
+ // Optional liveness analyzer.
+ MethodLiveness* _liveness;
+-#ifdef COMPILER2
++#if defined(COMPILER2) || defined(SHARK)
+ ciTypeFlow* _flow;
+ #endif
+
+--- openjdk/hotspot/src/share/vm/ci/ciMethod.cpp.orig 2008-11-22 00:11:18.000000000 +0000
++++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp 2008-12-03 14:33:48.000000000 +0000
+@@ -56,9 +56,9 @@
+ _liveness = NULL;
+ _bcea = NULL;
+ _method_blocks = NULL;
+-#ifdef COMPILER2
++#if defined(COMPILER2) || defined(SHARK)
+ _flow = NULL;
+-#endif // COMPILER2
++#endif // COMPILER2 || SHARK
+
More information about the distro-pkg-dev
mailing list