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

Revert upstream fix for S8035283

Browse Source 
This fix is was not included in the icedtea 7 patches, and possibly
causes a crash on i686.
This commit is contained in:
Omair Majid 2014-04-16 10:21:21 -04:00
parent 485496c9b6
commit 952f6b3ed1
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java-1.8.0-openjdk.spec
View File

@ -211,6 +211,9 @@ Patch102: %{name}-size_t.patch
# Patch for PPC/PPC64
Patch103: %{name}-ppc-zero-hotspot.patch
# Revert an upstream commit; possibly causes a jit crash
Patch104: revert-8035283.patch
Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
@ -425,6 +428,7 @@ sh %{SOURCE12}
%patch6
%patch99
%patch104
# Type fixes for s390
%ifarch s390 s390x
@ -1095,6 +1099,9 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
* Wed Apr 16 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-1.b13
- Revert upstream patch for S8035283. Possibly causes a crash on i686.
* Tue Apr 15 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-1.b13
- Update to the latest security release: OpenJDK8 u5 b13

41
revert-8035283.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git jdk8/hotspot/src/share/vm/opto/output.cpp jdk8/hotspot/src/share/vm/opto/output.cpp
--- jdk8/hotspot/src/share/vm/opto/output.cpp
+++ jdk8/hotspot/src/share/vm/opto/output.cpp
@@ -344,11 +344,6 @@
uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks);
uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks);
int* jmp_nidx = NEW_RESOURCE_ARRAY(int ,nblocks);
-
- // Collect worst case block paddings
- int* block_worst_case_pad = NEW_RESOURCE_ARRAY(int, nblocks);
- memset(block_worst_case_pad, 0, nblocks * sizeof(int));
-
DEBUG_ONLY( uint *jmp_target = NEW_RESOURCE_ARRAY(uint,nblocks); )
DEBUG_ONLY( uint *jmp_rule = NEW_RESOURCE_ARRAY(uint,nblocks); )
@@ -465,7 +460,6 @@
last_avoid_back_to_back_adr += max_loop_pad;
}
blk_size += max_loop_pad;
- block_worst_case_pad[i + 1] = max_loop_pad;
}
}
@@ -505,16 +499,9 @@
if (bnum > i) { // adjust following block's offset
offset -= adjust_block_start;
}
-
- // This block can be a loop header, account for the padding
- // in the previous block.
- int block_padding = block_worst_case_pad[i];
- assert(i == 0 || block_padding == 0 || br_offs >= block_padding, "Should have at least a padding on top");
// In the following code a nop could be inserted before
// the branch which will increase the backward distance.
- bool needs_padding = ((uint)(br_offs - block_padding) == last_may_be_short_branch_adr);
- assert(!needs_padding || jmp_offset[i] == 0, "padding only branches at the beginning of block");
-
+ bool needs_padding = ((uint)br_offs == last_may_be_short_branch_adr);
if (needs_padding && offset <= 0)
offset -= nop_size;