github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 04:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang_check_attributes TypeError when accessing compilation database (#5622)

Browse Source 
Signed-off-by: Bartłomiej Chmiel <bchmiel@antmicro.com>
This commit is contained in:
Bartłomiej Chmiel 2024-11-21 13:05:18 +01:00 committed by GitHub
parent 5470cf9fa9
commit 58dae8f931
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nodist/clang_check_attributes
View File

@ -38,6 +38,7 @@ else:
def __getattr__(cls, name: str) -> clang.cindex.CursorKind: def __getattr__(cls, name: str) -> clang.cindex.CursorKind:
return getattr(clang.cindex.CursorKind, name) return getattr(clang.cindex.CursorKind, name)
# pylint: disable-next=invalid-enum-extension
class CursorKind(clang.cindex.CursorKind, metaclass=CursorKindMeta): class CursorKind(clang.cindex.CursorKind, metaclass=CursorKindMeta):
pass pass
@ -1145,10 +1146,14 @@ def main():
for refid, file in enumerate(cmdline.file): for refid, file in enumerate(cmdline.file):
filename = os.path.abspath(file) filename = os.path.abspath(file)
root = default_compilation_root root = default_compilation_root
cxxflags = [] cxxflags = common_cxxflags[:]
if compdb: if compdb:
entry = compdb.getCompileCommands(filename) entry = compdb.getCompileCommands(filename)
entry_list = list(entry) if entry is None:
print(f"%Error: reading compile commands failed: {filename}", file=sys.stderr)
entry_list = []
else:
entry_list = list(entry)
# Compilation database can contain multiple entries for single file, # Compilation database can contain multiple entries for single file,
# e.g. when it has been updated by appending new entries. # e.g. when it has been updated by appending new entries.
# Use last entry for the file, if it exists, as it is the newest one. # Use last entry for the file, if it exists, as it is the newest one.
@ -1160,9 +1165,7 @@ def main():
# compiler executable name/path. CIndex (libclang) always # compiler executable name/path. CIndex (libclang) always
# implicitly prepends executable name, so it shouldn't be passed # implicitly prepends executable name, so it shouldn't be passed
# here. # here.
cxxflags = common_cxxflags + entry_args[1:] cxxflags.extend(entry_args[1:])
else:
cxxflags = common_cxxflags[:]
compile_command = CompileCommand(refid, filename, cxxflags, root) compile_command = CompileCommand(refid, filename, cxxflags, root)
compile_commands_list.append(compile_command) compile_commands_list.append(compile_command)