diff -urN gcc-16.1.0-orig/gcc/c/c-decl.cc gcc-16.1.0/gcc/c/c-decl.cc --- gcc-16.1.0-orig/gcc/c/c-decl.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/c/c-decl.cc 2026-05-07 23:29:52 +0900 @@ -4671,6 +4671,8 @@ { gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE); + return name_hint (NULL, NULL); /* Fuzzy lookup disabled. */ + /* Look up function-like macros first; maybe misusing them. */ auto cpp_node = cpp_lookup (parse_in, (const unsigned char*)IDENTIFIER_POINTER (name), diff -urN gcc-16.1.0-orig/gcc/c/c-typeck.cc gcc-16.1.0/gcc/c/c-typeck.cc --- gcc-16.1.0-orig/gcc/c/c-typeck.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/c/c-typeck.cc 2026-05-07 23:28:32 +0900 @@ -3049,6 +3049,8 @@ { gcc_assert (TREE_CODE (component) == IDENTIFIER_NODE); + return NULL_TREE; /* Fuzzy lookup disabled. */ + /* First, gather a list of candidates. */ auto_vec candidates; diff -urN gcc-16.1.0-orig/gcc/cp/name-lookup.cc gcc-16.1.0/gcc/cp/name-lookup.cc --- gcc-16.1.0-orig/gcc/cp/name-lookup.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/cp/name-lookup.cc 2026-05-07 23:29:28 +0900 @@ -7449,6 +7449,8 @@ suggest_alternatives_for (location_t location, tree name, bool suggest_misspellings) { + return name_hint (); /* Fuzzy lookup disabled. */ + /* First, search for exact matches in other namespaces. */ namespace_hints ns_hints (location, name); name_hint result = ns_hints.convert_candidates_to_name_hint (); @@ -7510,6 +7512,8 @@ name_hint suggest_alternatives_in_other_namespaces (location_t location, tree name) { + return name_hint (); /* Fuzzy lookup disabled. */ + namespace_hints ns_hints (location, name); name_hint result = ns_hints.convert_candidates_to_name_hint (); @@ -7649,6 +7653,8 @@ suggest_alternative_in_explicit_scope (location_t location, tree name, tree scope) { + return name_hint (); /* Fuzzy lookup disabled. */ + /* Something went very wrong; don't suggest anything. */ if (name == error_mark_node) return name_hint (); @@ -7682,6 +7688,8 @@ name_hint suggest_alternative_in_scoped_enum (tree name, tree scoped_enum) { + return name_hint (); /* Fuzzy lookup disabled. */ + gcc_assert (SCOPED_ENUM_P (scoped_enum)); best_match bm (name); @@ -8082,6 +8090,8 @@ { gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE); + return name_hint (); /* Fuzzy lookup disabled. */ + /* Look up function-like macros first; maybe misusing them. */ auto cpp_node = cpp_lookup (parse_in, (const unsigned char*)IDENTIFIER_POINTER (name), diff -urN gcc-16.1.0-orig/gcc/cp/search.cc gcc-16.1.0/gcc/cp/search.cc --- gcc-16.1.0-orig/gcc/cp/search.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/cp/search.cc 2026-05-07 23:28:32 +0900 @@ -1365,6 +1365,8 @@ tree lookup_member_fuzzy (tree xbasetype, tree name, bool want_type_p) { + return NULL_TREE; /* Fuzzy lookup disabled. */ + tree type = NULL_TREE, basetype_path = NULL_TREE; class lookup_field_fuzzy_info lffi (want_type_p); diff -urN gcc-16.1.0-orig/gcc/opt-suggestions.cc gcc-16.1.0/gcc/opt-suggestions.cc --- gcc-16.1.0-orig/gcc/opt-suggestions.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/opt-suggestions.cc 2026-05-07 23:28:32 +0900 @@ -36,6 +36,8 @@ const char * option_proposer::suggest_option (const char *bad_opt) { + return NULL; /* Fuzzy lookup disabled. */ + /* Lazily populate m_option_suggestions. */ if (!m_option_suggestions) build_option_suggestions (NULL); diff -urN gcc-16.1.0-orig/gcc/opts-common.cc gcc-16.1.0/gcc/opts-common.cc --- gcc-16.1.0-orig/gcc/opts-common.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/opts-common.cc 2026-05-07 23:28:32 +0900 @@ -1435,7 +1435,7 @@ p += len + 1; } p[-1] = '\0'; - return find_closest_string (arg, &candidates); + return NULL; /* find_closest_string (arg, &candidates); */ } /* Perform diagnostics for read_cmdline_option and control_warning_option diff -urN gcc-16.1.0-orig/gcc/opts.cc gcc-16.1.0/gcc/opts.cc --- gcc-16.1.0-orig/gcc/opts.cc 2026-04-30 17:33:20 +0900 +++ gcc-16.1.0/gcc/opts.cc 2026-05-07 23:28:32 +0900 @@ -2292,6 +2292,8 @@ const struct sanitizer_opts_s *opts, enum opt_code code, int value) { + return NULL; /* Fuzzy lookup disabled. */ + best_match bm (arg); for (int i = 0; opts[i].name != NULL; ++i) {