From patchwork Fri Dec 13 19:16:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike Stump X-Patchwork-Id: 301151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B079B2C009A for ; Sat, 14 Dec 2013 06:16:12 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; q=dns; s=default; b=AR9PsxSGhTeL2RRQ44NiitTaVQ PvAPIBT79QZwpC66yuQJ7go2fZNXrJlzLgTGqTIDgJ2Ud6er78Gqw6q8k9nIIpqp 55elmNWqYbWaW5dvPkaT3VgqpvhYTjTwRzgpZ/fVTMmEZTfNZTKlUxJJovyu41Ln Hut284MRwaYbG5VaY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:content-transfer-encoding:subject:message-id:date :to:mime-version; s=default; bh=3ZlSMVN6E8cD/DQRorBpBhoq9co=; b= q1KlW1jWgMfUvqaAKA0S5WJeQucjBjSfSPNhzOvQra/n4xq6l7yfu1VuTh8A1Plq 3pBPj9xAEjnmLy0Qrk9EpjQ5j/ygs2nNhoOlf1Svuk1qaWLUa9cwcoBrWuHWTvIR mo2oDfIdszRo0QHv6TqA8ukOz8aDWs42fvvy+pfXrHQ= Received: (qmail 2002 invoked by alias); 13 Dec 2013 19:16:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 1975 invoked by uid 89); 13 Dec 2013 19:16:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: qmta15.emeryville.ca.mail.comcast.net Received: from qmta15.emeryville.ca.mail.comcast.net (HELO qmta15.emeryville.ca.mail.comcast.net) (76.96.27.228) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Dec 2013 19:16:04 +0000 Received: from omta10.emeryville.ca.mail.comcast.net ([76.96.30.28]) by qmta15.emeryville.ca.mail.comcast.net with comcast id 15Gt1n0030cQ2SLAF7FvxF; Fri, 13 Dec 2013 19:15:55 +0000 Received: from up.mrs.kithrup.com ([24.4.193.8]) by omta10.emeryville.ca.mail.comcast.net with comcast id 17G11n00X0BKwT48W7G2zB; Fri, 13 Dec 2013 19:16:02 +0000 From: Mike Stump Subject: [wide-int] Resolve merge conflicts. Message-Id: Date: Fri, 13 Dec 2013 11:16:01 -0800 To: gcc-patches List Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) X-IsSubscribed: yes Here are some soft merge conflict resolutions…. I've checked them in to fix the build. Ok? Index: ChangeLog.wide-int =================================================================== --- ChangeLog.wide-int (revision 205969) +++ ChangeLog.wide-int (working copy) @@ -524,6 +524,7 @@ (aff_combination_constant_multiple_p): Likewise. (get_inner_reference_aff): Likewise. (aff_comb_cannot_overlap_p): Likewise. + (aff_combination_zero_p): Use wide-int interfaces. * tree.c: Include tree.h. (init_ttree): Use make_int_cst. (tree_code_size): Removed code for INTEGER_CST case. @@ -768,6 +769,8 @@ (scev_probably_wraps_p): Likewise. * tree-ssa-math-opts.c (gimple_expand_builtin_pow): Update calls to real_to_integer. + * tree-scalar-evolution.c: + (simplify_peeled_chrec): Use wide-int interfaces. * tree-ssanames.c (set_range_info): Use wide_int_refs rather than double_ints. Adjust for trailing_wide_ints <3> representation. @@ -866,6 +869,7 @@ (output_constructor_bitfield): Likewise. * var-tracking.c (loc_cmp): Handle CONST_WIDE_INT. + * mkconfig.sh: Define BITS_PER_UNIT for GENERATOR_FILEs. * wide-int.cc: New. * wide-int.h: New. * wide-int-print.cc: New. Index: mkconfig.sh =================================================================== --- mkconfig.sh (revision 205969) +++ mkconfig.sh (working copy) @@ -100,6 +100,9 @@ case $output in #if defined IN_GCC && !defined GENERATOR_FILE # include "insn-modes.h" #endif +#if defined IN_GCC && defined GENERATOR_FILE +# define BITS_PER_UNIT 8 +#endif EOF ;; esac Index: tree-affine.h =================================================================== --- tree-affine.h (revision 205969) +++ tree-affine.h (working copy) @@ -91,7 +91,7 @@ aff_combination_zero_p (aff_tree *aff) if (!aff) return true; - if (aff->n == 0 && aff->offset.is_zero ()) + if (aff->n == 0 && aff->offset == 0) return true; return false; Index: tree-scalar-evolution.c =================================================================== --- tree-scalar-evolution.c (revision 205969) +++ tree-scalar-evolution.c (working copy) @@ -1426,7 +1426,7 @@ simplify_peeled_chrec (struct loop *loop tree_to_aff_combination_expand (left, type, &aff1, &peeled_chrec_map); tree_to_aff_combination_expand (step_val, type, &aff2, &peeled_chrec_map); free_affine_expand_cache (&peeled_chrec_map); - aff_combination_scale (&aff2, double_int_minus_one); + aff_combination_scale (&aff2, -1); aff_combination_add (&aff1, &aff2); /* Transform (init, {left, right}_LOOP)_LOOP to {init, right}_LOOP Index: tree-ssa-loop-niter.c =================================================================== --- tree-ssa-loop-niter.c (revision 205969) +++ tree-ssa-loop-niter.c (working copy) @@ -175,7 +175,7 @@ determine_value_range (struct loop *loop the VAR range, give up on looking at the PHI results. This can happen if VR_UNDEFINED is involved. */ - if (wi::gt_p (minv, maxv)) + if (wi::gt_p (minv, maxv, sgn)) { rtype = get_range_info (var, &minv, &maxv); break;