This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjdk-7-jre-dcevm.
commit 3162413f633458073c98f77d5a5763eb7c97b997 Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 10 11:26:26 2016 +0100 Updated the DCEVM patches for Java 7u79 (build 8) --- debian/changelog | 1 + .../patches/full-jdk7u79-b15-method-handles.patch | 27 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dbd96ff..aa8ca48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ openjdk-7-jre-dcevm (7u79-3) UNRELEASED; urgency=medium + * Updated the DCEVM patches for Java 7u79 (build 8) * Standards-Version updated to 3.9.7 (no changes) -- Emmanuel Bourg <[email protected]> Wed, 10 Feb 2016 11:11:09 +0100 diff --git a/debian/patches/full-jdk7u79-b15-method-handles.patch b/debian/patches/full-jdk7u79-b15-method-handles.patch index b6e5a64..c19c2e0 100644 --- a/debian/patches/full-jdk7u79-b15-method-handles.patch +++ b/debian/patches/full-jdk7u79-b15-method-handles.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent a51cdc4778871d65e004c6858c2d4afa806dbe42 +# Parent 9792762e75f795196a5ff68e8cd5a52380b332d0 --- a/src/share/vm/classfile/javaClasses.cpp +++ b/src/share/vm/classfile/javaClasses.cpp @@ -122,6 +122,31 @@ // Interface to java.lang.invoke.LambdaForm objects // (These are a private interface for managing adapter code generation.) +--- a/src/share/vm/classfile/systemDictionary.cpp ++++ b/src/share/vm/classfile/systemDictionary.cpp +@@ -44,6 +44,7 @@ + #include "oops/oop.inline2.hpp" + #include "oops/typeArrayKlass.hpp" + #include "prims/jvmtiEnvBase.hpp" ++#include "prims/jvmtiRedefineClassesTrace.hpp" + #include "prims/methodHandles.hpp" + #include "runtime/biasedLocking.hpp" + #include "runtime/fieldType.hpp" +@@ -2032,9 +2033,11 @@ + assert(check->klass_part()->oop_is_instance(), "noninstance in systemdictionary"); + if ((defining == true) && ((k() != check) && k->old_version() != check)) { + ResourceMark rm(Thread::current()); +- tty->print_cr("(%d / %d) (%s/%s)", k->revision_number(), check->klass_part()->revision_number(), k->name()->as_C_string(), check->klass_part()->name()->as_C_string()); +- k()->print(); +- check->print(); ++ if (RC_TRACE_ENABLED(0x00000001)) { ++ tty->print_cr("(%d / %d) (%s/%s)", k->revision_number(), check->klass_part()->revision_number(), k->name()->as_C_string(), check->klass_part()->name()->as_C_string()); ++ k()->print(); ++ check->print(); ++ } + linkage_error = "loader (instance of %s): attempted duplicate class " + "definition for name: \"%s\""; + } else { --- a/src/share/vm/classfile/systemDictionary.hpp +++ b/src/share/vm/classfile/systemDictionary.hpp @@ -148,6 +148,8 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-7-jre-dcevm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
