Switch outlining to default, remove verification focused flag changes

Author: gbMattN

clang/docs/TypeSanitizer.rst

@@ -144,11 +144,6 @@ forces all code instrumentation to be outlined. This reduces the size of the
 generated code and reduces compile-time overhead, but it also reduces runtime
 performance.
 
-This outlined instrumentation is new. If you wish to verify that the outlined instrumentation
-is behaving in the same way as the inline instrumentation, you can force TypeSanitizer
-to use both types of instrumentation. You can use the clang flag
-``-fsanitize-type-verify-outlined-instrumentation`` (default: ``false``) to do this.
-
 ``__has_feature(type_sanitizer)``
 ------------------------------------
 

clang/include/clang/Driver/SanitizerArgs.h

@@ -68,7 +68,6 @@ class SanitizerArgs {
   bool TsanAtomics = true;
   bool MinimalRuntime = false;
   bool TysanOutlineInstrumentation = false;
-  bool TysanVerifyOutlinedInstrumentation = false;
   // True if cross-dso CFI support if provided by the system (i.e. Android).
   bool ImplicitCfiRuntime = false;
   bool NeedsMemProfRt = false;

clang/include/clang/Options/Options.td

@@ -2465,12 +2465,6 @@ def fsanitize_type_outline_instrumentation : Flag<["-"], "fsanitize-type-outline
 def fno_sanitize_type_outline_instrumentation : Flag<["-"], "fno-sanitize-type-outline-instrumentation">,
                                                    Group<f_clang_Group>,
                                                    HelpText<"Use default code inlining logic for the type sanitizer">;
-def fsanitize_type_verify_outlined_instrumentation : Flag<["-"], "fsanitize-type-verify-outlined-instrumentation">,
-                                                   Group<f_clang_Group>,
-                                                   HelpText<"Use both inlined and outlined instrumentation for type sanitizer to verify equivilence">;
-def fno_sanitize_type_verify_outlined_instrumentation : Flag<["-"], "fno_sanitize-type-verify-outlined-instrumentation">,
-                                                   Group<f_clang_Group>,
-                                                   HelpText<"Don't use both inlined and outlined instrumentation for type sanitizer to verify equivilence">;
 defm sanitize_stable_abi
   : OptInCC1FFlag<"sanitize-stable-abi", "Stable  ", "Conventional ",
     "ABI instrumentation for sanitizer runtime. Default: Conventional">;

clang/lib/Driver/SanitizerArgs.cpp

@@ -1181,10 +1181,6 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC,
         Args.hasFlag(options::OPT_fsanitize_type_outline_instrumentation,
                      options::OPT_fno_sanitize_type_outline_instrumentation,
                      TysanOutlineInstrumentation);
-    TysanVerifyOutlinedInstrumentation = Args.hasFlag(
-        options::OPT_fsanitize_type_verify_outlined_instrumentation,
-        options::OPT_fno_sanitize_type_verify_outlined_instrumentation,
-        TysanVerifyOutlinedInstrumentation);
   }
 
   LinkRuntimes = Args.hasFlag(options::OPT_fsanitize_link_runtime,
@@ -1511,14 +1507,10 @@ void SanitizerArgs::addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
     CmdArgs.push_back("-asan-instrumentation-with-call-threshold=0");
   }
 
-  if (TysanOutlineInstrumentation || TysanVerifyOutlinedInstrumentation) {
+  if (TysanOutlineInstrumentation) {
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back("-tysan-outline-instrumentation");
   }
-  if (TysanVerifyOutlinedInstrumentation) {
-    CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back("-tysan-verify-outlined-instrumentation");
-  }
 
   // When emitting Stable ABI instrumentation, force outlining calls and avoid
   // inlining shadow memory poisoning. While this is a big performance burden

clang/test/CodeGen/sanitize-type-outlined.cpp

@@ -6,18 +6,8 @@
 // RUN:     -fsanitize-type-outline-instrumentation \
 // RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE
 
-// RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
-// RUN:     -fsanitize-type-outline-instrumentation \
-// RUN:     -fsanitize-type-verify-outlined-instrumentation \
-// RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE-VERIFY
-// RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
-// RUN:     -fsanitize-type-verify-outlined-instrumentation \
-// RUN:     | FileCheck %s --check-prefixes=CHECK-VERIFY
-
 // CHECK-NO-OUTLINE-NOT: call{{.*}}@__tysan_instrument_mem_inst
 // CHECK-OUTLINE: call{{.*}}@__tysan_instrument_mem_inst
-// CHECK-OUTLINE-VERIFY: call{{.*}}@__tysan_instrument_mem_inst
-// CHECK-VERIFY: call{{.*}}@__tysan_instrument_mem_inst
 
 float alias(int *ptr){
     float *aliasedPtr = (float *)ptr;

llvm/lib/Transforms/Instrumentation/TypeSanitizer.cpp

@@ -62,7 +62,7 @@ static cl::opt<bool> ClOutlineInstrumentation(
     "tysan-outline-instrumentation",
     cl::desc("Uses function calls for all TySan instrumentation, reducing "
              "ELF size"),
-    cl::Hidden, cl::init(false));
+    cl::Hidden, cl::init(true));
 
 static cl::opt<bool> ClVerifyOutlinedInstrumentation(
     "tysan-verify-outlined-instrumentation",