Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: build/common.gypi

Issue 402983002: Remove -fsanitize=null for ubsan_vptr=1 build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved merge issue. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index db01f93e0664e2469b03eff81e6dc1c8e1a7b1c4..c06e74dcb6d07f522c665f4fbdcb431667c659f1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -396,7 +396,7 @@
# See http://clang.llvm.org/docs/UsersManual.html
'ubsan%': 0,
- # Enable building with UBsan's vptr (Clang's -fsanitize=vptr -fsanitize=null options).
+ # Enable building with UBsan's vptr (Clang's -fsanitize=vptr option).
# -fsanitize=vptr only works with clang, but ubsan_vptr=1 implies clang=1
'ubsan_vptr%': 0,
'ubsan_vptr_blacklist%': '<(PRODUCT_DIR)/../../tools/ubsan_vptr/blacklist.txt',
@@ -4032,7 +4032,6 @@
['_toolset=="target"', {
'cflags': [
'-fsanitize=vptr',
- '-fsanitize=null', # Avoid dereferences on null pointer objects.
'-fsanitize-blacklist=<(ubsan_vptr_blacklist)',
],
'cflags_cc!': [
@@ -4042,7 +4041,7 @@
'-fno-rtti',
],
'ldflags': [
- '-fsanitize=vptr', # -fsanitize=null is not necessary.
+ '-fsanitize=vptr',
],
'defines': [
'UNDEFINED_SANITIZER',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698