From patchwork Mon Jul 1 23:22:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dehao Chen X-Patchwork-Id: 256241 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 5C19B2C0097 for ; Tue, 2 Jul 2013 09:22:27 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:cc:content-type; q=dns; s=default; b=ymS8mLbt0Xt22D5vh9TfHfFxhMkf4MK9100P6axdPKp ZbN4eALNat1YD65MPoDlxdcpNrl7a7nmaja4hP+HG04nAkibpmgJKYQ/6TMeWw8J C3FgQRFrt5ZnVn8JYWwjqu5vj4i81dQWti68W2qXaVTjLfe9aqcgVKFzASyxDlyc = 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 :mime-version:date:message-id:subject:from:to:cc:content-type; s=default; bh=KpGJPQ/UHJ0gNg7HLjgzS2iWeew=; b=sYBA0pN6+BSjJzNEC KmIBbASclLJra97adZatTo7zNC9UkkLtVweiNXEVf9ptfxqJGtSymPbkUZ3vF0j4 Fv56s8lxw0XKpkUgSokB64yljGa+u/mKVHQHFQ9QDf46IOIK0dgF1Dex9uDgbn/v phje/HkQSjZVy/GCEVGLdEprCU= Received: (qmail 15480 invoked by alias); 1 Jul 2013 23:22:21 -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 15449 invoked by uid 89); 1 Jul 2013 23:22:14 -0000 X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.1 Received: from mail-ee0-f48.google.com (HELO mail-ee0-f48.google.com) (74.125.83.48) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 01 Jul 2013 23:22:13 +0000 Received: by mail-ee0-f48.google.com with SMTP id b47so2323140eek.21 for ; Mon, 01 Jul 2013 16:22:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-gm-message-state; bh=wRHE0/C8A0OWmIc6/Y3H4c20Y5MoZL8kR7kyOSpkeEo=; b=Fx1aap0qv7j/Rp5/Jwzh74AN819ajV7cfnlkOgRh1/ExwwbHtFJKJ9Eoj1PLhUCe5r Z9zE+tJW0q5Udc92q5UJPjFs98IPFpPgT2YAc4Tz3e06gmaImIMiGDxyx4uThsHqcZ2l /eL/mlmVxza8WuHZTFyMdjFANtxIVZ65P0uFqwtoyRPIYgZSONFJlKdhnXYH4YSfPWD2 6Q9ay/opYEDzHpau4rcFtXtmt8+jnhZW2ECQ5BJLzV8G8YKADwGGtDx9zZt2wHJmlWH+ qCw31OgunlqEfHk65U7qqOnQ1GpZm0aKx5FpVGaoF1PU2vg8M17MGHwTShDqpK9rRMmL tb3Q== MIME-Version: 1.0 X-Received: by 10.15.108.8 with SMTP id cc8mr23145990eeb.65.1372720931677; Mon, 01 Jul 2013 16:22:11 -0700 (PDT) Received: by 10.14.210.69 with HTTP; Mon, 1 Jul 2013 16:22:11 -0700 (PDT) Date: Mon, 1 Jul 2013 16:22:11 -0700 Message-ID: Subject: [GOOGLE] use expand_location when checking same_line_p From: Dehao Chen To: GCC Patches Cc: Cary Coutant X-Gm-Message-State: ALoCoQkdDpcK6mtJ64leA+xeo/cmVQL8kfgh43MT5CF/z6qI/b6FSR6wycKyvUPc7sTLvmQCqoSGjkN2vTeTlwCgy4iJhZBJtDErCgXF0ic8wy+BQgVXqlZRCd0twB4t27WPljoXA2fGPy2wwN9neiTnkVXy7k8q8moksPwh5qW5OKNxTfHwp7+eW1mC6U+eI+TrtZSayK50LpUIwdg0dlmy9kmW8Ht9/w== This patch replaces expand_location_to_spelling_point with expand_location so that macros will not be expanded. Bootstrapped and passed regression test. OK for google-4_8 branch? Thanks, Dehao Index: gcc/tree-cfg.c =================================================================== --- gcc/tree-cfg.c (revision 200584) +++ gcc/tree-cfg.c (working copy) @@ -732,8 +732,8 @@ same_line_p (location_t locus1, location_t locus2) if (locus1 == locus2) return true; - from = expand_location_to_spelling_point (locus1); - to = expand_location_to_spelling_point (locus2); + from = expand_location (locus1); + to = expand_location (locus2); if (from.line != to.line) return false;