Fix assertion failure in x86 build

Message ID 1385483927.2109.61.camel@localhost.localdomain
State New
Headers show

Commit Message

Edward Nevill Nov. 26, 2013, 4:38 p.m.
Hi,

The following patch fixes an assertion failure "no relocInfo found for pc" on a pure x86 build (ie x86 target).

This doesn't benefit aarch64 in any way, but it is useful to be able to continue to build x86 from the same tree.

Regards,
Ed.

--- CUT HERE ---
# HG changeset patch
# User Edward Nevill edward.nevill@linaro.org
# Date 1385383118 0
#      Mon Nov 25 12:38:38 2013 +0000
# Node ID 36a829ad1cdd5fb34eae3f369e49f5b21d5b8ae8
# Parent  0460e912b30024c5fbecc84c1ac438be3098db47
Fix assertion failure "no relocInfo found for pc" in x86 build

Patch

diff -r 0460e912b300 -r 36a829ad1cdd src/share/vm/c1/c1_Runtime1.cpp
--- a/src/share/vm/c1/c1_Runtime1.cpp	Mon Nov 25 12:06:41 2013 +0000
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Mon Nov 25 12:38:38 2013 +0000
@@ -1141,7 +1141,7 @@ 
 
           if (load_klass_or_mirror_patch_id
               || stub_id == Runtime1::load_appendix_patching_id
-	      || stub_id == Runtime1::access_field_patching_id) {
+	      AARCH64_ONLY(|| stub_id == Runtime1::access_field_patching_id)) {
             relocInfo::relocType rtype;
 	    switch(stub_id) {
 	    case Runtime1::load_klass_patching_id:
--- CUT HERE ---