From b71fbb61411553a0b523ff56931c1360a333fc31 Mon Sep 17 00:00:00 2001 From: "byoungyoung@chromium.org" Date: Fri, 18 Jul 2014 23:09:24 +0000 Subject: [PATCH] Remove -fsanitize=null for ubsan_vptr=1 build. As functional dependencies on -fsanitize=null are removed for -fsanitize=vptr (Clang r213393), removing the -fsanitize=null option accordingly. BUG=174801 R=aarya@google.com Review URL: https://codereview.chromium.org/402983002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@284245 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index 77439eb53..533ea808a 100644 --- a/common.gypi +++ b/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', @@ -4031,7 +4031,6 @@ ['_toolset=="target"', { 'cflags': [ '-fsanitize=vptr', - '-fsanitize=null', # Avoid dereferences on null pointer objects. '-fsanitize-blacklist=<(ubsan_vptr_blacklist)', ], 'cflags_cc!': [ @@ -4041,7 +4040,7 @@ '-fno-rtti', ], 'ldflags': [ - '-fsanitize=vptr', # -fsanitize=null is not necessary. + '-fsanitize=vptr', ], 'defines': [ 'UNDEFINED_SANITIZER',