From patchwork Fri Jan 17 13:47:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1224839 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517593-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=FEYt3N9D; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=b2+wmqFc; dkim-atps=neutral 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 47zj8C3QCWz9sSQ for ; Sat, 18 Jan 2020 00:48:41 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=xTY9z0XrKKHxoYxgnt7pW2DUw/l/0kZtu34kOSD1ceWQsEQwxJ sbLsQGhHXC9Q4g24Jbw23Jzos4WULP9DanMfWqW0K73yj0RKA0jjvT2oz8p8Dayp RkmNX9Jlf7vwFyBGdppQSGY0uTy3CCEcmfu9Zfqli2tp4C4GZZo10rXXc= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=PozL80vc/ixJo+Cmksa2FiPa5NE=; b=FEYt3N9DSr5T3z+oV+WR t7PT6TFzjyL32Erp3q2/Fm2ZyA/o5He7y56261RhXRmwJ/K1GbZZbAHfoJ9JN4VA WGLgyQtgnFhHIWp8DCY6i+sWTmtj9x5mXBwQGvb1nIfYOvbf68kAfNOcG1hcdIsV J9Qi774YMuEmQd+BOMX6d8c= Received: (qmail 56284 invoked by alias); 17 Jan 2020 13:48:31 -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 56160 invoked by uid 89); 17 Jan 2020 13:48:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=circuit X-HELO: mail-qk1-f193.google.com Received: from mail-qk1-f193.google.com (HELO mail-qk1-f193.google.com) (209.85.222.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Jan 2020 13:48:03 +0000 Received: by mail-qk1-f193.google.com with SMTP id 21so22728847qky.4 for ; Fri, 17 Jan 2020 05:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:cc:from:subject:message-id:date:user-agent:mime-version :content-language; bh=eNbpV2MZUBCWOpRL36bStY4k4agIb8VEBiHOjwGi8V8=; b=b2+wmqFcxdMq9ack2lHBcE/keT3NDFPvLht05CVFIPw8SM30gZGyg97wGyAiCCZ6Q1 WXgwmqvhaTDG9hmwCt0L+ET4J3dU567BPLO8HISmhG46ynZ2IUmgeQXWgWrX2sWL27Gl zqE0rwCWnkqtp3Nl3h2lIazva/CSSuoB0mBMvuUJxny2rbLzyQnMzTmDzVdsw1Zx9kY1 Gng7eRTAxkKvWjezMuQoZO6K6CLT8/8oBDXmyFcGevlw6NEaoLB/uKgUcYIOlnC7/8Wo raHvkFP/rb4BxQxKK5o3139nIv3YhooFkB3cpClTBZ4TceAspL19q+LCK9msiY1Pfzl+ 73qA== Received: from ?IPv6:2620:10d:c0a3:1407:8c67:8e5b:ba16:e153? ([2620:10d:c091:500::1:82a0]) by smtp.googlemail.com with ESMTPSA id q126sm11776171qkd.21.2020.01.17.05.47.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Jan 2020 05:47:57 -0800 (PST) To: GCC Patches Cc: Jonathan Wakely From: Nathan Sidwell Subject: [PR 93306] short circuit has_include Message-ID: Date: Fri, 17 Jan 2020 08:47:56 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 As Jonathan discovered, #if FALSE_THING && has_include still goes look for foo. This patch makes the has_include evaluator check skip_eval before looking for foo -- but after parsing the has_include to diagnose ill-formedness. Sadly, no testcase, because it's pretty much only observable via strace, which I did manually. nathan 2020-01-17 Nathan Sidwell PR preprocessor/93306 * expr.c (parse_has_include): Refactor. Check skip_eval before looking. diff --git c/libcpp/expr.c w/libcpp/expr.c index 1078c0722f6..317faf50208 100644 --- c/libcpp/expr.c +++ w/libcpp/expr.c @@ -2195,11 +2195,6 @@ static cpp_num parse_has_include (cpp_reader *pfile, enum include_type type) { cpp_num result; - bool paren = false; - cpp_hashnode *node = 0; - const cpp_token *token; - bool bracket = false; - char *fname = 0; result.unsignedp = false; result.high = 0; @@ -2208,39 +2203,34 @@ parse_has_include (cpp_reader *pfile, enum include_type type) pfile->state.in__has_include__++; - token = cpp_get_token (pfile); - if (token->type == CPP_OPEN_PAREN) - { - paren = true; - token = cpp_get_token (pfile); - } + const cpp_token *token = cpp_get_token (pfile); + bool paren = token->type == CPP_OPEN_PAREN; + if (paren) + token = cpp_get_token (pfile); + bool bracket = token->type != CPP_STRING; + cpp_hashnode *node = NULL; + char *fname = NULL; if (token->type == CPP_STRING || token->type == CPP_HEADER_NAME) { - if (token->type == CPP_HEADER_NAME) - bracket = true; fname = XNEWVEC (char, token->val.str.len - 1); memcpy (fname, token->val.str.text + 1, token->val.str.len - 2); fname[token->val.str.len - 2] = '\0'; node = token->val.node.node; } else if (token->type == CPP_LESS) - { - bracket = true; - fname = _cpp_bracket_include (pfile); - } + fname = _cpp_bracket_include (pfile); else cpp_error (pfile, CPP_DL_ERROR, "operator \"__has_include__\" requires a header string"); if (fname) { - int angle_brackets = (bracket ? 1 : 0); - - if (_cpp_has_header (pfile, fname, angle_brackets, type)) + /* Do not do the lookup if we're skipping, that's unnecessary + IO. */ + if (!pfile->state.skip_eval + && _cpp_has_header (pfile, fname, bracket, type)) result.low = 1; - else - result.low = 0; XDELETEVEC (fname); }