Skip to content

improve update_cc_test_checks.py for template #102505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

improve update_cc_test_checks.py for template #102505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions llvm/utils/update_cc_test_checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def parse_clang_ast_json(node, loc, search):
"TranslationUnitDecl",
"CXXRecordDecl",
"ClassTemplateSpecializationDecl",
"FunctionTemplateDecl",
):
# Specializations must use the loc from the specialization, not the
# template, and search for the class's spelling as the specialization
Expand All @@ -89,6 +90,7 @@ def parse_clang_ast_json(node, loc, search):
"CXXConstructorDecl",
"CXXDestructorDecl",
"CXXConversionDecl",
"FunctionTemplateDecl",
):
return
if loc is None:
Expand All @@ -105,25 +107,35 @@ def parse_clang_ast_json(node, loc, search):
)
return

# If there is no 'inner' object, it is a function declaration and we can
# skip it. However, function declarations may also contain an 'inner' list,
# but in that case it will only contains ParmVarDecls. If we find an entry
# that is not a ParmVarDecl, we know that this is a function definition.
has_body = False
if "inner" in node:
for i in node["inner"]:
if i.get("kind", "ParmVarDecl") != "ParmVarDecl":
has_body = True
break
if not has_body:
common.debug("Skipping function without body:", node["name"], "@", loc)
return
spell = node["name"]
if search is None:
search = spell
mangled = node.get("mangledName", spell)
ret[int(line) - 1].append((spell, mangled, search))

# If this is a FunctionTemplateDecl, we need to extract the mangled name
# of the template instantiation(s)
if node_kind == "FunctionTemplateDecl":
for inner in node.get("inner", []):
if inner["kind"] == "FunctionDecl":
spell = inner["name"]
mangled = inner.get("mangledName", spell)
if search is None:
search = spell
ret[int(line) - 1].append((spell, mangled, search))
else:
# If there is no 'inner' object, it is a function declaration and we can
# skip it. However, function declarations may also contain an 'inner' list,
# but in that case it will only contains ParmVarDecls. If we find an entry
# that is not a ParmVarDecl, we know that this is a function definition.
has_body = False
if "inner" in node:
for i in node["inner"]:
if i.get("kind", "ParmVarDecl") != "ParmVarDecl":
has_body = True
break
if not has_body:
common.debug("Skipping function without body:", node["name"], "@", loc)
return
spell = node["name"]
if search is None:
search = spell
mangled = node.get("mangledName", spell)
ret[int(line) - 1].append((spell, mangled, search))
ast = json.loads(stdout)
if ast["kind"] != "TranslationUnitDecl":
common.error("Clang AST dump JSON format changed?")
Expand Down
Loading