rpms/java-1.8.0-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fixing typo of jkd in system_installed_libpng and removing file for removed patch for pr3573

Browse Source 
jkd8035341-allow_using_system_installed_libpng.patch -> jdk8035341-allow_using_system_installed_libpng.patch
rm pr3573-fix_TCK_crash_with_shenandoah_in_shenandoahsupport_cpp_in_case_of_dead_brnach_in_is_independent.patch
This commit is contained in:
Jiri Vanek 2018-11-23 18:43:10 +01:00
parent 195d8173c7
commit 626887d706
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java-1.8.0-openjdk.spec
View File

@ -1155,7 +1155,7 @@ Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
# 8035341: Allow using a system installed libpng
Patch202: jkd8035341-allow_using_system_installed_libpng.patch
Patch202: jdk8035341-allow_using_system_installed_libpng.patch
# 8042159: Allow using a system-installed lcms2
Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization

0
jkd8035341-allow_using_system_installed_libpng.patch → jdk8035341-allow_using_system_installed_libpng.patch
View File

25
pr3573-fix_TCK_crash_with_shenandoah_in_shenandoahsupport_cpp_in_case_of_dead_brnach_in_is_independent.patch
View File

@ -1,25 +0,0 @@
# HG changeset patch
# User roland
# Date 1506520357 -7200
# Wed Sep 27 15:52:37 2017 +0200
# Node ID c307975d0800f8da5cc8e82cd8f1fdadbd745357
# Parent ab0c101fa16e4cd97ac8ceff4f5ff72e2f4d5776
[backport] fix TCK crash with shenandoah
diff --git a/src/share/vm/opto/shenandoahSupport.cpp b/src/share/vm/opto/shenandoahSupport.cpp
--- openjdk/hotspot/src/share/vm/opto/shenandoahSupport.cpp
+++ openjdk/hotspot/src/share/vm/opto/shenandoahSupport.cpp
@@ -472,9 +472,11 @@
Node* input = in(Memory);
if (input->Opcode() == Op_ShenandoahWBMemProj) {
Node* wb = input->in(0);
- if (wb->is_top()) return NULL; // Dead path.
+ const Type* in_type = phase->type(wb);
+ // is_top() test not sufficient here: we can come here after CCP
+ // in a dead branch of the graph that has not yet been removed.
+ if (in_type == Type::TOP) return NULL; // Dead path.
assert(wb->Opcode() == Op_ShenandoahWriteBarrier, "expect write barrier");
- const Type* in_type = phase->type(wb);
if (is_independent(in_type, _type)) {
if (phase->is_IterGVN()) {
phase->is_IterGVN()->rehash_node_delayed(wb);