From patchwork Sat Jul 12 09:51:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Zamyatin, Igor" X-Patchwork-Id: 369285 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AC01D1400BE for ; Sat, 12 Jul 2014 19:51:53 +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:from :to:subject:date:message-id:content-type :content-transfer-encoding:mime-version; q=dns; s=default; b=S4p qbw7Vrm8a2H+MOyIwmXXPPFTEa15jgk1x38POU3mWbUY9AuTcXzeH3wwDpOKXBZx C+IgJ/4MitQI21KfnwMgZf6p94g1/kL4606Aej5QcczAhGVONu7bC47XxGi+HKNM uBB97cbKmxjqPeHmY14maKLd4lNAEslOmDs/G3XE= 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 :to:subject:date:message-id:content-type :content-transfer-encoding:mime-version; s=default; bh=9CUhK711a o2MqNBeMWkeFwyy5+E=; b=LUW5B6g6ZeOnzw+8px16ZXmetRjRiafpVXZ7SNhJz RuRth5yWYKkbUypIE1SUc2YRlLuiEh79pi1SIucZ/iVrM4/LewUvWtkHyl/RtsZ7 1Mkd1B9c34pohw9nsCkxnDxeQ7agf5YSW37emab/cjf5gAZWvYwOfYN83NoodFZU bY= Received: (qmail 32358 invoked by alias); 12 Jul 2014 09:51:46 -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 32348 invoked by uid 89); 12 Jul 2014 09:51:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_00, MIME_CHARSET_FARAWAY, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mga09.intel.com Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 12 Jul 2014 09:51:44 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 12 Jul 2014 02:46:02 -0700 X-ExtLoop1: 1 Received: from irsmsx103.ger.corp.intel.com ([163.33.3.157]) by orsmga002.jf.intel.com with ESMTP; 12 Jul 2014 02:51:35 -0700 Received: from irsmsx101.ger.corp.intel.com ([169.254.1.56]) by IRSMSX103.ger.corp.intel.com ([169.254.3.62]) with mapi id 14.03.0123.003; Sat, 12 Jul 2014 10:51:35 +0100 From: "Zamyatin, Igor" To: "GCC Patches (gcc-patches@gcc.gnu.org)" Subject: [PATCH 1/3, Cilk+] Fix for PR61455 Date: Sat, 12 Jul 2014 09:51:34 +0000 Message-ID: <0EFAB2BDD0F67E4FB6CCC8B9F87D756969A815A8@IRSMSX101.ger.corp.intel.com> MIME-Version: 1.0 X-IsSubscribed: yes Hi! This simple change fixes the issue with printing of error message (happened in unprintable_error routine of the PR's test) Regtested with the next patch of this chain. Ok for trunk/4.9? Thanks, Igor gcc/cp/Changelog: 2014-07-08  Igor Zamyatin  * cp-array-notation.c (expand_an_in_modify_expr): Fix the misprint in error output. diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c index b45449b..6b910fc 100644 --- a/gcc/cp/cp-array-notation.c +++ b/gcc/cp/cp-array-notation.c @@ -607,7 +607,7 @@ expand_an_in_modify_expr (location_t location, tree lhs,         if (lhs_rank == 0 && rhs_rank != 0)      { -      error_at (location, "%qD cannot be scalar when %qD is not", lhs, rhs); +      error_at (location, "%qE cannot be scalar when %qE is not", lhs, rhs);        return error_mark_node;      }    if (lhs_rank != 0 && rhs_rank != 0 && lhs_rank != rhs_rank)