diff --git a/clang/lib/Tooling/Inclusions/Stdlib/StdSpecialSymbolMap.inc b/clang/lib/Tooling/Inclusions/Stdlib/StdSpecialSymbolMap.inc --- a/clang/lib/Tooling/Inclusions/Stdlib/StdSpecialSymbolMap.inc +++ b/clang/lib/Tooling/Inclusions/Stdlib/StdSpecialSymbolMap.inc @@ -254,6 +254,40 @@ SYMBOL(make_index_sequence, std::, ) SYMBOL(make_integer_sequence, std::, ) +// The std::placeholder symbols (_1, ..., _N) are listed in the cppreference +// placeholder.html, but the index only contains a single entry with "_1, _2, ..., _N" +// text, which are not handled by the script. +// N is an implementation-defined number (10 for libc++; 29 for libstdc++). +SYMBOL(_1, std::placeholders::, ) +SYMBOL(_2, std::placeholders::, ) +SYMBOL(_3, std::placeholders::, ) +SYMBOL(_4, std::placeholders::, ) +SYMBOL(_5, std::placeholders::, ) +SYMBOL(_6, std::placeholders::, ) +SYMBOL(_7, std::placeholders::, ) +SYMBOL(_8, std::placeholders::, ) +SYMBOL(_9, std::placeholders::, ) +SYMBOL(_10, std::placeholders::, ) +SYMBOL(_11, std::placeholders::, ) +SYMBOL(_12, std::placeholders::, ) +SYMBOL(_13, std::placeholders::, ) +SYMBOL(_14, std::placeholders::, ) +SYMBOL(_15, std::placeholders::, ) +SYMBOL(_16, std::placeholders::, ) +SYMBOL(_17, std::placeholders::, ) +SYMBOL(_18, std::placeholders::, ) +SYMBOL(_19, std::placeholders::, ) +SYMBOL(_20, std::placeholders::, ) +SYMBOL(_21, std::placeholders::, ) +SYMBOL(_22, std::placeholders::, ) +SYMBOL(_23, std::placeholders::, ) +SYMBOL(_24, std::placeholders::, ) +SYMBOL(_25, std::placeholders::, ) +SYMBOL(_26, std::placeholders::, ) +SYMBOL(_27, std::placeholders::, ) +SYMBOL(_28, std::placeholders::, ) +SYMBOL(_29, std::placeholders::, ) + // Macros SYMBOL(NULL, None, ) SYMBOL(NULL, None, ) diff --git a/clang/tools/include-mapping/gen_std.py b/clang/tools/include-mapping/gen_std.py --- a/clang/tools/include-mapping/gen_std.py +++ b/clang/tools/include-mapping/gen_std.py @@ -245,9 +245,8 @@ # We don't index std literal operators (e.g. # std::literals::chrono_literals::operator""d), these symbols can't be # accessed by std::. - # FIXME: index std::placeholders symbols, placeholders.html page is - # different (which contains one entry for _1, _2, ..., _N), we need special - # handling. + # + # std::placeholders symbols are handled manually in StdSpecialSymbolMap.inc (symbol_index_root, "chrono.html", "std::chrono::"), (symbol_index_root, "filesystem.html", "std::filesystem::"), (symbol_index_root, "pmr.html", "std::pmr::"),