Add more reset changes

Author: gbMattN

clang/docs/UsersManual.rst

@@ -2280,9 +2280,9 @@ are listed below.
 .. option:: -f[no-]sanitize-type-outline-instrumentation
 
    Controls how type sanitizer code is generated. If enabled will always use
-   a function call instead of inlining the code. Turning this option on may
-   reduce the binary size and compilation overhead, but might result in a worse
-   run-time performance.
+   a function call instead of inlining the code. Turning this option off may
+   result in better run-time performance, but will increase binary size and
+   compilation overhead.
 
    See :doc: `TypeSanitizer` for more details.
 

clang/include/clang/Driver/SanitizerArgs.h

@@ -67,7 +67,7 @@ class SanitizerArgs {
   bool TsanFuncEntryExit = true;
   bool TsanAtomics = true;
   bool MinimalRuntime = false;
-  bool TysanOutlineInstrumentation = false;
+  bool TysanOutlineInstrumentation = true;
   // 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

@@ -2464,7 +2464,7 @@ def fsanitize_type_outline_instrumentation : Flag<["-"], "fsanitize-type-outline
                                                 HelpText<"Always generate function calls for type sanitizer instrumentation">;
 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">;
+                                                   HelpText<"Use code inlining logic for the type sanitizer">;
 defm sanitize_stable_abi
   : OptInCC1FFlag<"sanitize-stable-abi", "Stable  ", "Conventional ",
     "ABI instrumentation for sanitizer runtime. Default: Conventional">;

clang/lib/Driver/SanitizerArgs.cpp

@@ -1507,11 +1507,7 @@ void SanitizerArgs::addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
     CmdArgs.push_back("-asan-instrumentation-with-call-threshold=0");
   }
 
-  if (TysanOutlineInstrumentation) {
-    CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back("-tysan-outline-instrumentation");
-  }
-  else{
+  if (!TysanOutlineInstrumentation) {
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back("-tysan-outline-instrumentation=false");
   }

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

@@ -1,16 +1,29 @@
 // UNSUPPORTED: target={{.*}}-windows-{{.*}}
 
+// RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
+// RUN:     | FileCheck %s --check-prefixes=CHECK-NO-OUTLINE
 // RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
 // RUN:     -fsanitize-type-outline-instrumentation \
 // RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE
+
 // RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
-// RUN:     -fno-sanitize-type-outline-instrumentation \
-// RUN:     | FileCheck %s --check-prefixes=CHECK-NO-OUTLINE
+// RUN:     -fsanitize-type-outline-instrumentation \
+// RUN:     -fsanitize-type-verify-outlined-instrumentation \
+// RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE
+// RUN: %clang -S -fsanitize=type -emit-llvm -o - -fsanitize=type %s \
+// RUN:     -fsanitize-type-verify-outlined-instrumentation \
+// RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE
 
-// CHECK-OUTLINE: call{{.*}}@__tysan_instrument_mem_inst
+// CHECK-LABEL: @alias
+// CHECK: __tysan_app_memory_mask
+// CHECK: __tysan_shadow_memory_address
 // CHECK-NO-OUTLINE-NOT: call{{.*}}@__tysan_instrument_mem_inst
+// CHECK-NO-OUTLINE-NOT: call{{.*}}@__tysan_instrument_with_shadow_update
+// CHECK-OUTLINE: call{{.*}}@__tysan_instrument_mem_inst
+// CHECK-OUTLINE: call{{.*}}@__tysan_instrument_with_shadow_update
 
 float alias(int *ptr){
     float *aliasedPtr = (float *)ptr;
+    *aliasedPtr *= 2.0f;
     return *aliasedPtr;
 }