From a1f6eff20e3bb32c5051e77093ee28faec2abca0 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 24 Jan 2020 04:19:36 -0800 Subject: [PATCH] Remove bogus __has_include controlling macro I noticed, but ignored this code when addressing p80005, but having fixed up defined(X) on the modules branch, I could see where it came from, and it's obviously wrong as we've just pulled out a string contant from the token. * expr.c (parse_has_include): Remove bogus controlling macro code. --- libcpp/ChangeLog | 4 ++++ libcpp/expr.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 27a841bbdcef..e84c0da4f185 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2020-01-24 Nathan Sidwell + + * expr.c (parse_has_include): Remove bogus controlling macro code. + 2020-01-20 Nathan Sidwell PR preprocessor/80005 diff --git a/libcpp/expr.c b/libcpp/expr.c index df21a4b9fb9f..6c56803e3b06 100644 --- a/libcpp/expr.c +++ b/libcpp/expr.c @@ -2211,14 +2211,12 @@ parse_has_include (cpp_reader *pfile, cpp_hashnode *op, include_type type) pfile->state.angled_headers = false; bool bracket = token->type != CPP_STRING; - cpp_hashnode *node = NULL; char *fname = NULL; if (token->type == CPP_STRING || token->type == CPP_HEADER_NAME) { 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) fname = _cpp_bracket_include (pfile); @@ -2241,8 +2239,5 @@ parse_has_include (cpp_reader *pfile, cpp_hashnode *op, include_type type) cpp_error (pfile, CPP_DL_ERROR, "missing ')' after \"%s\" operand", NODE_NAME (op)); - if (node) - pfile->mi_ind_cmacro = node; - return result; } -- 2.43.5