From patchwork Tue Nov 26 16:38:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 21784 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CA3BC202E0 for ; Tue, 26 Nov 2013 16:38:52 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id h16sf19860317oag.4 for ; Tue, 26 Nov 2013 08:38:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:subject:from:reply-to:to :cc:date:organization:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=Vc/bkDD2eMVYurBwxFSwgYYqBQMg3yS/9LaZLwFZWNs=; b=Ulkfp9BnBFfgVYLoocZHGhFkb1Mr38avx4E5mPJAhFMpVEEDPNOgeUPjfgQFDHqZ+1 DTAxExWq9DRQjrZlNm/zIQse9LkeIdpV3BzkIhWByY2dzUBkz/KFRhks+6RvJQ1P+O8v pjpVnLj5prGlFeJtW8zLq+TaSGuXu6Q5BGqIjHo/P5hWfkeOMLZX/lcQKGQfdtoim/Ck hdl8mKp3okgCDe8yBhlGECXziDTt36bIRSiikjSaPvOmBccZnEEPFk0ty3UBmrwzPhJa LIHW3wOaFr8RDWYhKsdfg5EXaZZyOVZVUZ1t8qHf/rUu84b4kxpfelD3ZJuQ+WJOfaK2 bQTg== X-Gm-Message-State: ALoCoQnwAm3CPoWBhmRUQkuS7yPKKoKndDPsnBM+lCrVd/LJmlmEVjZoPqKlIQteZqtH6J6U19qI X-Received: by 10.43.74.133 with SMTP id yw5mr9259959icb.15.1385483931921; Tue, 26 Nov 2013 08:38:51 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.70 with SMTP id s6ls671809qen.34.gmail; Tue, 26 Nov 2013 08:38:51 -0800 (PST) X-Received: by 10.58.246.136 with SMTP id xw8mr635299vec.41.1385483931794; Tue, 26 Nov 2013 08:38:51 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id ta5si19757930veb.31.2013.11.26.08.38.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 08:38:51 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so4235179veb.34 for ; Tue, 26 Nov 2013 08:38:51 -0800 (PST) X-Received: by 10.58.107.4 with SMTP id gy4mr639106veb.39.1385483931713; Tue, 26 Nov 2013 08:38:51 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp225814vcz; Tue, 26 Nov 2013 08:38:51 -0800 (PST) X-Received: by 10.205.74.4 with SMTP id yu4mr6698bkb.104.1385483930623; Tue, 26 Nov 2013 08:38:50 -0800 (PST) Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by mx.google.com with ESMTPS id ci7si11050830bkc.4.2013.11.26.08.38.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 08:38:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.49 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=209.85.214.49; Received: by mail-bk0-f49.google.com with SMTP id my13so2684662bkb.36 for ; Tue, 26 Nov 2013 08:38:50 -0800 (PST) X-Received: by 10.204.66.194 with SMTP id o2mr6578bki.98.1385483929906; Tue, 26 Nov 2013 08:38:49 -0800 (PST) Received: from [192.168.1.112] (validation.linaro.org. [88.98.47.97]) by mx.google.com with ESMTPSA id no2sm52110033bkb.15.2013.11.26.08.38.48 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 26 Nov 2013 08:38:48 -0800 (PST) Message-ID: <1385483927.2109.61.camel@localhost.localdomain> Subject: Fix assertion failure in x86 build From: Edward Nevill Reply-To: edward.nevill@linaro.org To: "aarch64-port-dev@openjdk.java.net" Cc: patches@linaro.org Date: Tue, 26 Nov 2013 16:38:47 +0000 Organization: Linaro X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) Mime-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: edward.nevill@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 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 ---