type and test firming

Author: gbMattN

clang/include/clang/Driver/Options.td

@@ -2462,10 +2462,10 @@ def fno_sanitize_type_outline_instrumentation : Flag<["-"], "fno-sanitize-type-o
                                                    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">;
+                                                   HelpText<"Use both inlined and outlined instrumentation for type sanitizer to verify equivalence">;
 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">;
+                                                   HelpText<"Don't use both inlined and outlined instrumentation for type sanitizer to verify equivalence">;
 defm sanitize_stable_abi
   : OptInCC1FFlag<"sanitize-stable-abi", "Stable  ", "Conventional ",
     "ABI instrumentation for sanitizer runtime. Default: Conventional">;

clang/test/CodeGen/sanitize-type-outlined.cpp renamed to clang/test/CodeGen/sanitize-type-outlined.c

@@ -9,17 +9,21 @@
 // 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:     | 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-VERIFY
+// RUN:     | FileCheck %s --check-prefixes=CHECK-OUTLINE
 
+// 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-VERIFY: call{{.*}}@__tysan_instrument_mem_inst
-// CHECK-VERIFY: 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;
 }

llvm/docs/ReleaseNotes.md

@@ -202,6 +202,8 @@ Changes to BOLT
 Changes to Sanitizers
 ---------------------
 
+* TypeSanitizer no longer inlines all instrumentation by default.
+
 Other Changes
 -------------