Mercurial > hg > openjdk > jdk9 > hotspot
changeset 11797:ab6d822dc3ff
Merge
author | never |
---|---|
date | Wed, 03 Aug 2016 15:52:38 +0000 |
parents | bf837d6d95f1 (current diff) b616b5fa5da1 (diff) |
children | a2e73f79284b |
files | |
diffstat | 3 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/frame_sparc.cpp Tue Aug 02 17:12:16 2016 -0700 +++ b/src/cpu/sparc/vm/frame_sparc.cpp Wed Aug 03 15:52:38 2016 +0000 @@ -357,12 +357,6 @@ _cb = CodeCache::find_blob(_pc); } _deopt_state = unknown; -#ifdef ASSERT - if ( _cb != NULL && _cb->is_compiled()) { - // Without a valid unextended_sp() we can't convert the pc to "original" - assert(!((CompiledMethod*)_cb)->is_deopt_pc(_pc), "invariant broken"); - } -#endif // ASSERT } frame::frame(intptr_t* sp, unpatchable_t, address pc, CodeBlob* cb) { @@ -534,6 +528,7 @@ void frame::patch_pc(Thread* thread, address pc) { + vmassert(_deopt_state != unknown, "frame is unpatchable"); if(thread == Thread::current()) { StubRoutines::Sparc::flush_callers_register_windows_func()(); }
--- a/test/TEST.groups Tue Aug 02 17:12:16 2016 -0700 +++ b/test/TEST.groups Wed Aug 03 15:52:38 2016 +0000 @@ -167,7 +167,7 @@ gc/survivorAlignment \ runtime/InternalApi/ThreadCpuTimesDeadlock.java \ runtime/NMT/JcmdSummaryDiff.java \ - runtime/RedefineTests/RedefineAnnotations.java + runtime/RedefineTests/RedefineAnnotations.java \ serviceability/sa/jmap-hashcode/Test8028623.java \ serviceability/threads/TestFalseDeadLock.java \ compiler/codecache/jmx \ @@ -282,7 +282,7 @@ -compiler/c2/Test6905845.java \ -compiler/c2/cr6340864 \ -compiler/c2/cr6589834 \ - -compiler/c2/cr8004867 + -compiler/c2/cr8004867 \ -compiler/c2/stemmer \ -compiler/c2/Test6792161.java \ -compiler/c2/Test6603011.java \
--- a/test/compiler/c2/Test6792161.java Tue Aug 02 17:12:16 2016 -0700 +++ b/test/compiler/c2/Test6792161.java Wed Aug 03 15:52:38 2016 +0000 @@ -27,7 +27,7 @@ * @bug 6792161 * @summary assert("No dead instructions after post-alloc") * - * @run main/othervm/timeout=600 -Xcomp -XX:MaxInlineSize=120 compiler.c2.Test6792161 + * @run main/othervm/timeout=600 -Xcomp -XX:-TieredCompilation -XX:MaxInlineSize=120 compiler.c2.Test6792161 */ package compiler.c2;