From patchwork Tue Nov 19 11:33:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 21624 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3956A23A4E for ; Tue, 19 Nov 2013 11:33:49 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf494953yhq.1 for ; Tue, 19 Nov 2013 03:33:49 -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=ucYsyD1LTDFAZLwsyjmTm/8kGpjsOrOdrmhrdPp8FBU=; b=kWTNGdOu3pC3T7szO9PWJDlTeCgBQevni/ZQtncoxaT3ffvWlOErvBpKcgYcrh6/PZ yhcSfZpoXVjbu8YxaRvFBhDe8w2OZhRAXnFYgryecLkm3L0WrG38q70fCwsh9KTSXolv IiqOX6WGR2UA21W3781opOryd/HKOxPVw13N1OrDXSwCqmnSspWVGCJNUMPBSxAOjeLH aQhxhD7BKLvgx+AL+KbFCz2vfcfM8ISpnH+3zU6SWezJ5R612d3/NP7ZuSs/bECgUQXB HXxu8AMvcS9pJzvkmdM50i79wxD1ojAPimibxKnDgJe8g9uMJm7WzfXgJK2YRiW4uEBK JTjw== X-Gm-Message-State: ALoCoQm/53cEwQ9wpFl5hAEk2Bit1SMKZtGllDxaAfVHqr9wJocR/CkAGwgrITjECmbqVRqpSohg X-Received: by 10.58.2.98 with SMTP id 2mr8931406vet.3.1384860829383; Tue, 19 Nov 2013 03:33:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.51.198 with SMTP id m6ls2345285qeo.43.gmail; Tue, 19 Nov 2013 03:33:49 -0800 (PST) X-Received: by 10.58.39.97 with SMTP id o1mr20731465vek.15.1384860829285; Tue, 19 Nov 2013 03:33:49 -0800 (PST) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id rp4si8029244vcb.36.2013.11.19.03.33.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:33:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id f12so5706791vbg.11 for ; Tue, 19 Nov 2013 03:33:49 -0800 (PST) X-Received: by 10.58.161.231 with SMTP id xv7mr20644723veb.2.1384860829201; Tue, 19 Nov 2013 03:33:49 -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 u4csp270931vcz; Tue, 19 Nov 2013 03:33:48 -0800 (PST) X-Received: by 10.14.102.66 with SMTP id c42mr10415052eeg.47.1384860828300; Tue, 19 Nov 2013 03:33:48 -0800 (PST) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx.google.com with ESMTPS id p9si8391245eew.73.2013.11.19.03.33.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:33:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.177 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=209.85.215.177; Received: by mail-ea0-f177.google.com with SMTP id n15so1682838ead.36 for ; Tue, 19 Nov 2013 03:33:47 -0800 (PST) X-Received: by 10.14.119.5 with SMTP id m5mr2372948eeh.58.1384860827622; Tue, 19 Nov 2013 03:33:47 -0800 (PST) Received: from [192.168.1.112] (validation.linaro.org. [88.98.47.97]) by mx.google.com with ESMTPSA id k7sm8340169eeg.13.2013.11.19.03.33.46 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:33:46 -0800 (PST) Message-ID: <1384860824.24385.4.camel@localhost.localdomain> Subject: Remove some temp changes made during merge to b110 From: Edward Nevill Reply-To: edward.nevill@linaro.org To: "aarch64-port-dev@openjdk.java.net" Cc: patches@linaro.org Date: Tue, 19 Nov 2013 11:33:44 +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.212.52 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 backs out some temporary debug changes I made when I was doing the merge up to b110 which ended up being pushed. Regards, Ed. --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1384860580 0 # Tue Nov 19 11:29:40 2013 +0000 # Node ID d88b8b0c31fc3d1da1cb2cdfe15eee6de5bd5c0d # Parent a9d5d7492f2fae53baccde69e7a6b4ce00cf77c7 Remove some temp changes which got left in during the merge to b110 diff -r a9d5d7492f2f -r d88b8b0c31fc src/share/vm/c1/c1_Compilation.cpp --- a/src/share/vm/c1/c1_Compilation.cpp Mon Nov 18 11:20:08 2013 +0000 +++ b/src/share/vm/c1/c1_Compilation.cpp Tue Nov 19 11:29:40 2013 +0000 @@ -343,10 +343,8 @@ // 3 bytes per character. We concatenate three such strings. // Yes, I know this is ridiculous, but it's debug code and glibc // allocates large arrays very efficiently. -// size_t len = (65536 * 3) * 3; -// char *name = new char[len]; - size_t len = 1024; - char name[1024]; + size_t len = (65536 * 3) * 3; + char *name = new char[len]; strncpy(name, _method->holder()->name()->as_utf8(), len); for (char *p = strpbrk(name, "/"); p; p = strpbrk(p, "/")) { diff -r a9d5d7492f2f -r d88b8b0c31fc src/share/vm/c1/c1_Runtime1.cpp --- a/src/share/vm/c1/c1_Runtime1.cpp Mon Nov 18 11:20:08 2013 +0000 +++ b/src/share/vm/c1/c1_Runtime1.cpp Tue Nov 19 11:29:40 2013 +0000 @@ -235,10 +235,8 @@ sasm->must_gc_arguments()); #ifdef BUILTIN_SIM if (NotifySimulator) { -// size_t len = 65536; -// char *name = new char[len]; - size_t len = 1024; - char name[1024]; + size_t len = 65536; + char *name = new char[len]; // tell the sim about the new stub code AArch64Simulator *simulator = AArch64Simulator::get_current(UseSimulatorCache, DisableBCCheck); --- CUT HERE ---