squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[scan-build] Supprot relative 'file' in cdb.

Browse source 
Excluded folders in scan build is turned to absolute path before
comapre to 'file' in cdb. 'file' in cdb might be a path relative
to 'directory', so we need to turn it to absolute path before
comparison.

Patch by Yu Shan

Differential Revision: https://reviews.llvm.org/D90362
This commit is contained in:
Haowei Wu 2020-11-09 20:06:20 -08:00
parent fde8351743
commit d93287cac8
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clang/tools/scan-build-py/libscanbuild/analyze.py
View file

@ -207,10 +207,14 @@ def merge_ctu_extdef_maps(ctudir):
def run_analyzer_parallel(args):
""" Runs the analyzer against the given compilation database. """
def exclude(filename):
def exclude(filename, directory):
""" Return true when any excluded directory prefix the filename. """
return any(re.match(r'^' + directory, filename)
for directory in args.excludes)
if not os.path.isabs(filename):
# filename is either absolute or relative to directory. Need to turn
# it to absolute since 'args.excludes' are absolute paths.
filename = os.path.normpath(os.path.join(directory, filename))
return any(re.match(r'^' + exclude_directory, filename)
for exclude_directory in args.excludes)
consts = {
'clang': args.clang,
@ -225,7 +229,8 @@ def run_analyzer_parallel(args):
logging.debug('run analyzer against compilation database')
with open(args.cdb, 'r') as handle:
generator = (dict(cmd, **consts)
for cmd in json.load(handle) if not exclude(cmd['file']))
for cmd in json.load(handle) if not exclude(
cmd['file'], cmd['directory']))
# when verbose output requested execute sequentially
pool = multiprocessing.Pool(1 if args.verbose > 2 else None)
for current in pool.imap_unordered(run, generator):