From patchwork Wed Mar 27 16:19:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87708 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 702C83858282 for ; Wed, 27 Mar 2024 16:20:13 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by sourceware.org (Postfix) with ESMTPS id 413FC3858D20 for ; Wed, 27 Mar 2024 16:19:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 413FC3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 413FC3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::129 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711556390; cv=none; b=grWwlVEy7kVfXRVSayGsmNsoHThhQUDgAqRNapu0NU1BKvEB+XCqJ1YAXYjbgMdEAGh4VjCmMMBQ1ZIYArp/7HUxuFpVYkWKI2LDGLuoe28w7+1QeLZCIyIKqJVbUefYLyAL74butqf6fCEMSCsjhcbyMzjd8rCSISdw8zWCeUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711556390; c=relaxed/simple; bh=xIsmtHm0yAU0pdC2B2mohYDHPwg7Zt9I9ZBlX+s1/zc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KHjE2IKoLk/b+dZxYz7dAUcv353mc31MlDuzVag7JoxZiezMhZz8ctCai1I3pmrXA4DIN5Eujg7jkpjKBiYbs/xhDy/Rb75KiTAOJHJE6M/RBDdlOX80b1o1CKxGsilyAEvSRoXuHB7Ka5sQPP0kDv54xNeYEka8Tod9y87Lh+g= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-36874406ac8so24282185ab.3 for ; Wed, 27 Mar 2024 09:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711556386; x=1712161186; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x7T1UB9KPypVCFAUI3igafReIoxvpysoa/09V4/nzd4=; b=BsPk/XCy+yir8OXCspFTzHA+6p4L9ZHCrBd2kVOR/+WvgxN8C0FmhC47Xo1+4fK/j7 7BX6iSCrCvItU8bpmuF03pLAfHNy8JWV558tSnsmePgTqm0G4zNzKLTViXuUoWkeLQbS 75hdibqQyD6Q7FnOtBTjEMcZbEc+RUEerpvviaqZdpUL0pGsPM7Qd06rh5rdjuDJeNFq 3ODxh1vf5qh+ScHK2931dRAOPtZ6m93qXEkF+bwG1Hjz/nM0/0qC+FFX7Rt9ICGmuD3m kg+hqJRufZDJWtlkk2t5RfLEZb/E14uT5Pd6ndvq7QRgJPiaFa58x+rTLMND/oWK2iIJ jwKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711556386; x=1712161186; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x7T1UB9KPypVCFAUI3igafReIoxvpysoa/09V4/nzd4=; b=s7IXSQTiU+3vCOsO9XC5DPd8LzjfaZgo/8PHgF7kaA6VxVaiCWFYBLRGQfm+MTzKQs 32TzgkNRGGxaq3OC1wCfI5dFqR8cZ9yQd4tuMRYOKvAbVAc/64Jzz5MFZ9LrnwGFdXAh /F9MB5p6nNtDC23j8H5v218kTsKJ46sr80y+TKn70AhKthc6VKl5XX9mS/b0hoXLDERU fWh4dpE5geBAdSB5/747SwxMPmb/J7wXWgZmhfxHQLeGcLmhx4CczSiAMoAxJh0h5TC6 /js9+xX0JVEyne5+nMw70vhaOFhxUpB/EAPZLJiZWFPsCooheVk/hfOpgTrUWfEGf3Pm tqYg== X-Gm-Message-State: AOJu0Yyk0ZeMWW+3Rp6yV8iErynO7v7zxzAGyoy96yQExzZW4JPcru99 MpOiSpUUlGFgGxJ7Qnsvi7MyCIg6vh8aQh2PTh3xfJp8UncciTuTi9YpGOLRR+82jZ6nq2qIK+I = X-Google-Smtp-Source: AGHT+IE0zMW3g4cG1kgf32uK8yIfIRyPG+uL/VMnhD8zt5ChPtsD2sF7jWVjKEmtGeKYKMiYwS5I2w== X-Received: by 2002:a05:6e02:1106:b0:368:94e0:2627 with SMTP id u6-20020a056e02110600b0036894e02627mr405626ilk.16.1711556386318; Wed, 27 Mar 2024 09:19:46 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id x10-20020a92b00a000000b00365cdc51c7esm3684575ilh.30.2024.03.27.09.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 09:19:45 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Fix clang build Date: Wed, 27 Mar 2024 10:19:37 -0600 Message-ID: <20240327161937.1489028-1-tromey@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Simon pointed out that commit 818ef5f4 ("Capture warnings when writing to the index cache") broke the build with clang. This patch fixes the breakage. --- gdb/utils.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/utils.h b/gdb/utils.h index d7db1d84e2f..875a2583179 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -444,10 +444,18 @@ struct deferred_warnings hook; see scoped_restore_warning_hook. Note that no locking is done, so users have to be careful to only install this into a single thread at a time. */ - void operator() (const char *format, va_list args) ATTRIBUTE_PRINTF (2, 0) + void operator() (const char *format, va_list args) { string_file msg (m_can_style); + /* Clang warns if we add ATTRIBUTE_PRINTF to this method (because + the function-view wrapper doesn't also have the attribute), but + then warns again if we remove it, because this vprintf call + does not use a literal format string. So, suppress the + warnings here. */ + DIAGNOSTIC_PUSH + DIAGNOSTIC_IGNORE_FORMAT_NONLITERAL msg.vprintf (format, args); + DIAGNOSTIC_POP m_warnings.emplace_back (std::move (msg)); }