From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 1C5E7385843D for ; Sat, 5 Nov 2022 01:55:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1C5E7385843D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667613334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jrNN2EnK/mJ4BfDPV3vjEJwZsguOnXEYrlPUZVQbdAI=; b=WAZ6Eb4i6zfjnSLgW9j1RwT2RU5rVvNmKK1O7MU3IC7zo3UWMPUlrkij93XbDWjhq59wq9 Ntqu3fNCG444OSRqDfgjF6L2KxuUsKhFCDi8SkDxq3KkJKViBwL7kR7eHXbR2JHlCyx47U 3yj+YG4pyzQ0dhSbQHRs1+yS3+nvDT0= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-611-goukubGsPBShUXn8idF3zw-1; Fri, 04 Nov 2022 21:55:33 -0400 X-MC-Unique: goukubGsPBShUXn8idF3zw-1 Received: by mail-qv1-f69.google.com with SMTP id ln3-20020a0562145a8300b004b8c29a7d50so4353979qvb.15 for ; Fri, 04 Nov 2022 18:55:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iOXBlvgfvipqfLc/5SxIYzcf5iwbzmM7NlG0M+9BhoY=; b=XvfwPYgpewhd/sycSUl4AlLdx1IjYZl8MFj5+hE1YEoskcGVOMlgCktpUPzzchqZmq tKORTJmPj64VTPdsoURT3kU3oWnIoUKKICB0nOHB/LqVECJwIivtzHXZRF0usQCErm9W xJNhEXqvsmSGIY4fP7X5HGlWyyVfAWSY13/WIKrPY+39CMBhgjSP1DYGNk3xxSxetmN0 rqIWiQVIgKqNtv3bifaZgeYe0gbbAYH7iGmg78Dlwde3uvm9+aqOC0V49UPmrT41ZdgS QAnsiafp/gokz5abFFx7MNmTF+InJtwR5qnHljv1YdVPf5cnULmVBlKvqEDKqcc0b88T ytBA== X-Gm-Message-State: ACrzQf0NCocnArag58bJieS6pvjkitWH9aCFTFr4OOFlSzPjbunkW3om 1s8X0rbMLRsXCx51H1NVEPeVT7qXO+hGFXMl2GYZjnuEHreCbjqAoZFWc0HkSie4Y1+bNIsPvTd a2qTLY2m4ZwC5mpLyZQ== X-Received: by 2002:a05:6214:3016:b0:4bb:9e66:1100 with SMTP id ke22-20020a056214301600b004bb9e661100mr34788636qvb.23.1667613333121; Fri, 04 Nov 2022 18:55:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM594CPrAqywPi0yx3tVE7KCYjJSo0C3Pt4+xGQPsObtZvuczDsp5VBQrGQLADP2QmckxGdcZw== X-Received: by 2002:a05:6214:3016:b0:4bb:9e66:1100 with SMTP id ke22-20020a056214301600b004bb9e661100mr34788630qvb.23.1667613332958; Fri, 04 Nov 2022 18:55:32 -0700 (PDT) Received: from t14s.localdomain (c-73-69-212-193.hsd1.nh.comcast.net. [73.69.212.193]) by smtp.gmail.com with ESMTPSA id w11-20020a05620a424b00b006f474e6a715sm601638qko.131.2022.11.04.18.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 18:55:32 -0700 (PDT) Message-ID: Subject: Re: [PATCH 5a/6] diagnostics: Handle generated data locations in edit_context From: David Malcolm To: Lewis Hyatt Cc: gcc-patches@gcc.gnu.org Date: Fri, 04 Nov 2022 21:55:32 -0400 In-Reply-To: <20221104210550.GA92497@ldh-imac.local> References: <20221104210550.GA92497@ldh-imac.local> User-Agent: Evolution 3.44.4 (3.44.4-1.fc36) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,BODY_8BITS,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Fri, 2022-11-04 at 17:05 -0400, Lewis Hyatt wrote: > [PATCH 5a/6] diagnostics: Handle generated data locations in > edit_context >=20 > Class edit_context handles outputting fixit hints in diff form that > could be > manually or automatically applied by the user. This will not make > sense for > generated data locations, such as the contents of a _Pragma string, > because > the text to be modified does not appear in the user's input files. We > do not > currently ever generate fixit hints in such a context, but for > future-proofing > purposes, ignore such locations in edit context now. >=20 > gcc/ChangeLog: >=20 > =09* edit-context.cc (edit_context::apply_fixit): Ignore > locations in > =09generated data. >=20 > diff --git a/gcc/edit-context.cc b/gcc/edit-context.cc > index 6879ddd41b4..aa95bc0834f 100644 > --- a/gcc/edit-context.cc > +++ b/gcc/edit-context.cc > @@ -301,8 +301,12 @@ edit_context::apply_fixit (const fixit_hint > *hint) > =C2=A0=C2=A0=C2=A0=C2=A0 return false; > =C2=A0=C2=A0 if (start.column =3D=3D 0) > =C2=A0=C2=A0=C2=A0=C2=A0 return false; > +=C2=A0 if (start.generated_data) > +=C2=A0=C2=A0=C2=A0 return false; > =C2=A0=C2=A0 if (next_loc.column =3D=3D 0) > =C2=A0=C2=A0=C2=A0=C2=A0 return false; > +=C2=A0 if (next_loc.generated_data) > +=C2=A0=C2=A0=C2=A0 return false; > =C2=A0 > =C2=A0=C2=A0 edited_file &file =3D get_or_insert_file (start.file); > =C2=A0=C2=A0 if (!m_valid) This patch is OK for trunk once the prerequisite patch is also approved. Thanks Dave