Commit 644379ee authored by ochang's avatar ochang Committed by Commit bot

Use new sanitizer coverage flags.

-fsanitize-coverage={edge,bb,func} are deprecated.

-fsanitize-coverage={edge,bb,func},trace-pc-guard should be used instead (edge is default).

BUG=chromium:651540

Review-Url: https://codereview.chromium.org/2860653002
Cr-Commit-Position: refs/heads/master@{#45072}
parent 973ec26e
...@@ -31,6 +31,8 @@ for exclusion in exclusions: ...@@ -31,6 +31,8 @@ for exclusion in exclusions:
remove_if_exists(args, '-fsanitize-coverage=func') remove_if_exists(args, '-fsanitize-coverage=func')
remove_if_exists(args, '-fsanitize-coverage=bb') remove_if_exists(args, '-fsanitize-coverage=bb')
remove_if_exists(args, '-fsanitize-coverage=edge') remove_if_exists(args, '-fsanitize-coverage=edge')
remove_if_exists(args, '-fsanitize-coverage=trace-pc-guard')
remove_if_exists(args, '-fsanitize-coverage=bb,trace-pc-guard')
break break
sys.exit(subprocess.check_call(args)) sys.exit(subprocess.check_call(args))
...@@ -499,8 +499,8 @@ ...@@ -499,8 +499,8 @@
}, },
'bb': { 'bb': {
'gn_args': 'sanitizer_coverage_flags="bb"', 'gn_args': 'sanitizer_coverage_flags="bb,trace-pc-guard"',
'gyp_defines': 'sanitizer_coverage=bb', 'gyp_defines': 'sanitizer_coverage=bb,trace-pc-guard',
}, },
'cfi': { 'cfi': {
...@@ -549,8 +549,8 @@ ...@@ -549,8 +549,8 @@
}, },
'edge': { 'edge': {
'gn_args': 'sanitizer_coverage_flags="edge"', 'gn_args': 'sanitizer_coverage_flags="trace-pc-guard"',
'gyp_defines': 'sanitizer_coverage=edge', 'gyp_defines': 'sanitizer_coverage=trace-pc-guard',
}, },
'gcc': { 'gcc': {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
], ],
}, },
'conditions': [ 'conditions': [
['coverage==1 and sanitizer_coverage=="bb"', { ['coverage==1 and sanitizer_coverage=="bb,trace-pc-guard"', {
'variables': { 'variables': {
'files': [ 'files': [
'../sanitizers/sancov_merger.py', '../sanitizers/sancov_merger.py',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment