Add no_sanitize('hwaddress') (and 'memtag', but that's a no-op).

[hctim]

Summary

Currently, __attribute__((no_sanitize('hwaddress'))) is not possible. Add this piece of plumbing, and now that we properly support copying attributes between an old and a new global variable, add a regression test for the GlobalOpt bug that previously lost the attribute.

[aaron.ballman]

Thank you for this, can you also add a release note for the fix?

clang/lib/Sema/SemaDeclAttr.cpp

8849

Spurious whitespace change?

clang/test/CodeGen/hwasan-globals.cpp

1–2

Are these files automatically deleted when the test is done because we're using %t, or do we need to clean those up manually?

9

Should we add a memtag test as well given that also changed in this patch?

compiler-rt/test/hwasan/TestCases/global-with-reduction.c

25

I'm not a compiler-rt expert, but is this valid? I assume this is using the system stdlib.h which is not something we usually want in lit tests.

I think that's why atoi was previously being forward declared; then we don't need to include the whole header file.

50

This is unnecessary -- falling off main already returns 0.

compiler-rt/test/hwasan/TestCases/global.c

47

This is unnecessary -- falling off main already returns 0.

[hctim]

Update.

clang/lib/Sema/SemaDeclAttr.cpp

8849

unfortunately there's no way in my editor to trim trailing whitespace only on changed lines :(, so i end up fixing things like this drive-by.

let me know if you feel very strongly about this diff and I can kill it, but I personally think the drive-by-fix isn't a huge problem and the alternative of whitespace-fix-only commit seems a bit overkill

clang/test/CodeGen/hwasan-globals.cpp

1–2

AFAIK nothing is ever automatically deleted (e.g. the outputs of the compiler). Is automated cleanup here necessary?

9

sure, done

compiler-rt/test/hwasan/TestCases/global-with-reduction.c

25

I don't see there being any problem with including stdlib.h here, it's done in lots of other compiler-rt tests.

I patched this up because the compiler actually complains about forward-declaring c library functions (it's just silenced by llvm-lit by default).

50

sure, done

compiler-rt/test/hwasan/TestCases/global.c

47

sure, done

[aaron.ballman]

clang/lib/Sema/SemaDeclAttr.cpp

8849

Personally, I don't feel very strongly because the chances of the whitespace being someone's entrypoint to git-blame is pretty minimal (especially given there's only one change here). However, we typically still ask for formatting changes to be separated out (https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access #2) rather than lumped in with functional changes so reviewers will ask for these sort of changes to be backed out, so this may crop up repeatedly if your editor doesn't give you the options you need.

clang/test/CodeGen/hwasan-globals.cpp

1–2

Necessary? Probably not (I'd expect these to go into the temp directory). A kindness so disks don't fill up? Probably. Because the content here is static anyway, these could just be files in the Inputs directory so they don't need to be created every time the test is run.

compiler-rt/test/hwasan/TestCases/global-with-reduction.c

25

Ah, good point about other tests doing this (it's a restriction we have in Clang tests, but not here from what I can tell).

[aaron.ballman]

Btw, precommit CI caught a failure:

FAIL: Clang :: CodeGen/hwasan-globals.cpp (4495 of 15547)
******************** TEST 'Clang :: CodeGen/hwasan-globals.cpp' FAILED ********************
Script:
--
: 'RUN: at line 1';   echo "int extra_global;" > C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.extra-source.cpp
: 'RUN: at line 2';   echo "global:*ignorelisted_global*" > C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.ignorelist
: 'RUN: at line 3';   c:\ws\w3\llvm-project\premerge-checks\build\bin\clang.exe -cc1 -internal-isystem c:\ws\w3\llvm-project\premerge-checks\build\lib\clang\15.0.0\include -nostdsysteminc -include C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.extra-source.cpp -fsanitize=hwaddress -fsanitize-ignorelist=C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.ignorelist -emit-llvm -o - C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp | c:\ws\w3\llvm-project\premerge-checks\build\bin\filecheck.exe C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp --check-prefixes=CHECK
: 'RUN: at line 5';   echo "src:C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp" | sed -e 's/\\/\\\\/g' > C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.ignorelist-src
: 'RUN: at line 6';   c:\ws\w3\llvm-project\premerge-checks\build\bin\clang.exe -cc1 -internal-isystem c:\ws\w3\llvm-project\premerge-checks\build\lib\clang\15.0.0\include -nostdsysteminc -include C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.extra-source.cpp -fsanitize=hwaddress -fsanitize-ignorelist=C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.ignorelist-src -emit-llvm -o - C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp | c:\ws\w3\llvm-project\premerge-checks\build\bin\filecheck.exe C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp --check-prefix=IGNORELIST
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "echo" "int extra_global;"
$ ":" "RUN: at line 2"
$ "echo" "global:*ignorelisted_global*"
$ ":" "RUN: at line 3"
$ "c:\ws\w3\llvm-project\premerge-checks\build\bin\clang.exe" "-cc1" "-internal-isystem" "c:\ws\w3\llvm-project\premerge-checks\build\lib\clang\15.0.0\include" "-nostdsysteminc" "-include" "C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.extra-source.cpp" "-fsanitize=hwaddress" "-fsanitize-ignorelist=C:\ws\w3\llvm-project\premerge-checks\build\tools\clang\test\CodeGen\Output\hwasan-globals.cpp.tmp.ignorelist" "-emit-llvm" "-o" "-" "C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp"
$ "c:\ws\w3\llvm-project\premerge-checks\build\bin\filecheck.exe" "C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp" "--check-prefixes=CHECK"
# command stderr:
C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp:21:11: error: CHECK: expected string not found in input
// CHECK: @{{.*}}extra_global{{.*}}.hwasan =
          ^
<stdin>:10:77: note: scanning from here
@"?ignorelisted_global@@3HA" = dso_local global i32 0, no_sanitize_hwaddress, align 4
                                                                            ^
<stdin>:17:1: note: possible intended match here
@"?extra_global@@3HA.hwasan" = private global { i32, [12 x i8] } { i32 0, [12 x i8] c"\00\00\00\00\00\00\00\00\00\00\00\01" }, align 16
^

Input file: <stdin>
Check file: C:\ws\w3\llvm-project\premerge-checks\clang\test\CodeGen\hwasan-globals.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            .
            .
            .
            5:  
            6: $hwasan.module_ctor = comdat any 
            7:  
            8: @"?attributed_global@@3HA" = dso_local global i32 0, no_sanitize_hwaddress, align 4 
            9: @"?disable_instrumentation_global@@3HA" = dso_local global i32 0, no_sanitize_hwaddress, align 4 
           10: @"?ignorelisted_global@@3HA" = dso_local global i32 0, no_sanitize_hwaddress, align 4 
check:21'0                                                                                 X~~~~~~~~~ error: no match found
           11: @llvm.used = appending global [1 x ptr] [ptr @hwasan.module_ctor], section "llvm.metadata" 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           12: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @hwasan.module_ctor, ptr @hwasan.module_ctor }] 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           13: @__start_hwasan_globals = external hidden constant [0 x i8] 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           14: @__stop_hwasan_globals = external hidden constant [0 x i8] 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           15: @hwasan.note = private constant { i32, i32, i32, [8 x i8], i32, i32 } { i32 8, i32 8, i32 3, [8 x i8] c"LLVM\00\00\00\00", i32 trunc (i64 sub (i64 ptrtoint (ptr @__start_hwasan_globals to i64), i64 ptrtoint (ptr @hwasan.note to i64)) to i32), i32 trunc (i64 sub (i64 ptrtoint (ptr @__stop_hwasan_globals to i64), i64 ptrtoint (ptr @hwasan.note to i64)) to i32) }, section ".note.hwasan.globals", comdat($hwasan.module_ctor), align 4 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           16: @hwasan.dummy.global = private constant [0 x i8] zeroinitializer, section "hwasan_globals", comdat($hwasan.module_ctor), !associated !0 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           17: @"?extra_global@@3HA.hwasan" = private global { i32, [12 x i8] } { i32 0, [12 x i8] c"\00\00\00\00\00\00\00\00\00\00\00\01" }, align 16 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:21'1     ?                                                                                                                                        possible intended match
           18: @"?extra_global@@3HA.hwasan.descriptor" = private constant { i32, i32 } { i32 trunc (i64 sub (i64 ptrtoint (ptr @"?extra_global@@3HA.hwasan" to i64), i64 ptrtoint (ptr @"?extra_global@@3HA.hwasan.descriptor" to i64)) to i32), i32 16777220 }, section "hwasan_globals", !associated !1 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           19: @"?global@@3HA.hwasan" = private global { i32, [12 x i8] } { i32 0, [12 x i8] c"\00\00\00\00\00\00\00\00\00\00\00\02" }, align 16 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           20: @"?global@@3HA.hwasan.descriptor" = private constant { i32, i32 } { i32 trunc (i64 sub (i64 ptrtoint (ptr @"?global@@3HA.hwasan" to i64), i64 ptrtoint (ptr @"?global@@3HA.hwasan.descriptor" to i64)) to i32), i32 33554436 }, section "hwasan_globals", !associated !2 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           21: @"?static_var@?1??func@@[e-mail]" = private global { i32, [12 x i8] } { i32 0, [12 x i8] c"\00\00\00\00\00\00\00\00\00\00\00\03" }, align 16 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           22: @"?static_var@?1??func@@[e-mail]" = private constant { i32, i32 } { i32 trunc (i64 sub (i64 ptrtoint (ptr @"?static_var@?1??func@@[e-mail]" to i64), i64 ptrtoint (ptr @"?static_var@?1??func@@[e-mail]" to i64)) to i32), i32 50331652 }, section "hwasan_globals", !associated !3 
check:21'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            .
            .
            .
>>>>>>

error: command failed with exit status: 1

--

********************

[hctim]

clang/lib/Sema/SemaDeclAttr.cpp

8849

Fixed in ee28837a1fbd574dbec14b9f09cb4effab6a492a.

clang/test/CodeGen/hwasan-globals.cpp

1–2

Done (and also will update asan-globals.cpp when this lands to use the new files as well).

[hctim]

Create test input files rather than synthesizing on the fly, fix tests on windows.

[aaron.ballman]

LGTM! The debian failures look like precommit CI is in a broken state again, but have nothing to do with your patch.

clang/lib/Sema/SemaDeclAttr.cpp

8849

Thanks!

[hubert.reinterpretcast]

This is causing "unsupported architecture" errors on bots.

[hubert.reinterpretcast]

From the content of this patch, it probably is llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp:

switch (TargetTriple.getArch()) {
case Triple::x86_64:
  // The signal handler will find the data address in rdi.
  Asm = InlineAsm::get(
      FunctionType::get(IRB.getVoidTy(), {PtrLong->getType()}, false),
      "int3\nnopl " +
          itostr(0x40 + (AccessInfo & HWASanAccessInfo::RuntimeMask)) +
          "(%rax)",
      "{rdi}",
      /*hasSideEffects=*/true);
  break;
case Triple::aarch64:
case Triple::aarch64_be:
  // The signal handler will find the data address in x0.
  Asm = InlineAsm::get(
      FunctionType::get(IRB.getVoidTy(), {PtrLong->getType()}, false),
      "brk #" + itostr(0x900 + (AccessInfo & HWASanAccessInfo::RuntimeMask)),
      "{x0}",
      /*hasSideEffects=*/true);
  break;
default:
  report_fatal_error("unsupported architecture");
}

[hctim]

In D127544#3609312, @hubert.reinterpretcast wrote:

This is causing "unsupported architecture" errors on bots.

Looking, I see this on the sanitizer-ppc64 bots.

[hctim]

Sent fadc98b06befb674fa47da4f3d8606bf61bed681 to fix-forward.

[hubert.reinterpretcast]

In D127544#3609335, @hctim wrote:

Sent fadc98b06befb674fa47da4f3d8606bf61bed681 to fix-forward.

I thought *-registered-target is true as long as the target is available, not only when the target happens to be the default.
Also, if there would be more such tests in the future, maybe a LIT feature that the default target supports HWAsan makes sense?

[hctim]

In D127544#3609343, @hubert.reinterpretcast wrote:

In D127544#3609335, @hctim wrote:

Sent fadc98b06befb674fa47da4f3d8606bf61bed681 to fix-forward.

I thought *-registered-target is true as long as the target is available, not only when the target happens to be the default.
Also, if there would be more such tests in the future, maybe a LIT feature that the default target supports HWAsan makes sense?

Too right. Given the purpose of this test is to just check that the globals have the right IR attributes, any target is fine - as the IR attributes aren't target-specific.

Took another fix-forward whack-a-mole attempt, committing in a sec.

[hctim]

I see that the clang-ppc64le-linux bot is green with the second attempt (https://lab.llvm.org/buildbot/#/builders/105/builds/27200). Please let me know if you have further issues.

[hubert.reinterpretcast]

In D127544#3609393, @hctim wrote:

I see that the clang-ppc64le-linux bot is green with the second attempt (https://lab.llvm.org/buildbot/#/builders/105/builds/27200). Please let me know if you have further issues.

Thanks. Will do (hopefully there won't be more issues).

clang/lib/Sema/SemaDeclAttr.cpp

 }
 
 static bool isGlobalVar(const Decl *D) {
   if (const auto *S = dyn_cast<VarDecl>(D))
     return S->hasGlobalStorage();
   return false;
 }
 
+static bool isSanitizerAttributeAllowedOnGlobals(StringRef Sanitizer) {
+  return Sanitizer == "address" || Sanitizer == "hwaddress" ||
+         Sanitizer == "memtag";
+}
+
 static void handleNoSanitizeAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (!AL.checkAtLeastNumArgs(S, 1))
     return;
 
   std::vector<StringRef> Sanitizers;
 
   for (unsigned I = 0, E = AL.getNumArgs(); I != E; ++I) {
     StringRef SanitizerName;
     SourceLocation LiteralLoc;
 
     if (!S.checkStringLiteralArgumentAttr(AL, I, SanitizerName, &LiteralLoc))
       return;
 
     if (parseSanitizerValue(SanitizerName, /*AllowGroups=*/true) ==
             SanitizerMask() &&
         SanitizerName != "coverage")
       S.Diag(LiteralLoc, diag::warn_unknown_sanitizer_ignored) << SanitizerName;
-    else if (isGlobalVar(D) && SanitizerName != "address")
+    else if (isGlobalVar(D) && !isSanitizerAttributeAllowedOnGlobals(SanitizerName))
       S.Diag(D->getLocation(), diag::err_attribute_wrong_decl_type)
           << AL << ExpectedFunctionOrMethod;
     Sanitizers.push_back(SanitizerName);
   }
 
   D->addAttr(::new (S.Context) NoSanitizeAttr(S.Context, AL, Sanitizers.data(),
                                               Sanitizers.size()));
 }
case ParsedAttr::AT_Uuid:
     handleUuidAttr(S, D, AL);
     break;
   case ParsedAttr::AT_MSInheritance:
     handleMSInheritanceAttr(S, D, AL);
     break;
   case ParsedAttr::AT_Thread:
     handleDeclspecThreadAttr(S, D, AL);
     break;
-  
   // HLSL attributes:
   case ParsedAttr::AT_HLSLNumThreads:
     handleHLSLNumThreadsAttr(S, D, AL);
     break;
   case ParsedAttr::AT_HLSLSV_GroupIndex:
     handleHLSLSVGroupIndexAttr(S, D, AL);
     break;
   case ParsedAttr::AT_HLSLShader:

clang/test/CodeGen/hwasan-globals.cpp

+// RUN: echo "int extra_global;" > %t.extra-source.cpp
+// RUN: echo "global:*ignorelisted_global*" > %t.ignorelist
+// RUN: %clang_cc1 -include %t.extra-source.cpp -fsanitize=hwaddress -fsanitize-ignorelist=%t.ignorelist -emit-llvm -o - %s | FileCheck %s --check-prefixes=CHECK
+// The ignorelist file uses regexps, so Windows path backslashes.
+// RUN: echo "src:%s" | sed -e 's/\\/\\\\/g' > %t.ignorelist-src
+// RUN: %clang_cc1 -include %t.extra-source.cpp -fsanitize=hwaddress -fsanitize-ignorelist=%t.ignorelist-src -emit-llvm -o - %s | FileCheck %s --check-prefix=IGNORELIST
+
+int global;
+int __attribute__((no_sanitize("hwaddress"))) attributed_global;
+int __attribute__((disable_sanitizer_instrumentation)) disable_instrumentation_global;
+int ignorelisted_global;
+
+void func() {
+  static int static_var = 0;
+  const char *literal = "Hello, world!";
+}
+
+// CHECK: @attributed_global = global {{.*}}, no_sanitize_hwaddress
+// CHECK: @disable_instrumentation_global = global {{.*}}, no_sanitize_hwaddress
+// CHECK: @ignorelisted_global = global {{.*}}, no_sanitize_hwaddress
+// CHECK: @extra_global.hwasan =
+// CHECK: @global.hwasan =
+// CHECK: @{{.*}}static_var{{.*}}.hwasan =
+// CHECK: @{{.*}}.hwasan = {{.*}} c"Hello, world!\00"
+
+// CHECK: !llvm.asan.globals = !{![[EXTRA_GLOBAL:[0-9]+]], ![[GLOBAL:[0-9]+]], ![[ATTR_GLOBAL:[0-9]+]], ![[DISABLE_INSTR_GLOBAL:[0-9]+]], ![[IGNORELISTED_GLOBAL:[0-9]+]], ![[STATIC_VAR:[0-9]+]], ![[LITERAL:[0-9]+]]}
+// CHECK: ![[EXTRA_GLOBAL]] = !{{{.*}} ![[EXTRA_GLOBAL_LOC:[0-9]+]], !"extra_global", i1 false, i1 false}
+// CHECK: ![[EXTRA_GLOBAL_LOC]] = !{!"{{.*}}extra-source.cpp", i32 1, i32 5}
+// CHECK: ![[GLOBAL]] = !{{{.*}} ![[GLOBAL_LOC:[0-9]+]], !"global", i1 false, i1 false}
+// CHECK: ![[GLOBAL_LOC]] = !{!"{{.*}}hwasan-globals.cpp", i32 8, i32 5}
+// CHECK: ![[ATTR_GLOBAL]] = !{{{.*attributed_global.*}}, null, null, i1 false, i1 true}
+// CHECK: ![[DISABLE_INSTR_GLOBAL]] = !{{{.*disable_instrumentation_global.*}}, null, null, i1 false, i1 true}
+// CHECK: ![[IGNORELISTED_GLOBAL]] = !{{{.*ignorelisted_global.*}}, null, null, i1 false, i1 true}
+// CHECK: ![[STATIC_VAR]] = !{{{.*}} ![[STATIC_LOC:[0-9]+]], !"static_var", i1 false, i1 false}
+// CHECK: ![[STATIC_LOC]] = !{!"{{.*}}hwasan-globals.cpp", i32 14, i32 14}
+// CHECK: ![[LITERAL]] = !{{{.*}} ![[LITERAL_LOC:[0-9]+]], !"<string literal>", i1 false, i1 false}
+// CHECK: ![[LITERAL_LOC]] = !{!"{{.*}}hwasan-globals.cpp", i32 15, i32 25}
+
+// IGNORELIST: @global = global {{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @attributed_global = global {{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @disable_instrumentation_global = global {{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @ignorelisted_global = global {{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @{{.*}}static_var{{.*}} = internal global {{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @{{.*}} = {{.*}} c"Hello, world!\00"{{.*}}, no_sanitize_hwaddress
+// IGNORELIST: @extra_global.hwasan =
+
+// IGNORELIST: !llvm.asan.globals = !{![[EXTRA_GLOBAL:[0-9]+]], ![[GLOBAL:[0-9]+]], ![[ATTR_GLOBAL:[0-9]+]], ![[DISABLE_INSTR_GLOBAL:[0-9]+]], ![[IGNORELISTED_GLOBAL:[0-9]+]], ![[STATIC_VAR:[0-9]+]], ![[LITERAL:[0-9]+]]}
+// IGNORELIST: ![[EXTRA_GLOBAL]] = !{{{.*}} ![[EXTRA_GLOBAL_LOC:[0-9]+]], !"extra_global", i1 false, i1 false}
+// IGNORELIST: ![[EXTRA_GLOBAL_LOC]] = !{!"{{.*}}extra-source.cpp", i32 1, i32 5}
+// IGNORELIST: ![[GLOBAL]] = !{{{.*}} null, null, i1 false, i1 true}
+// IGNORELIST: ![[ATTR_GLOBAL]] = !{{{.*attributed_global.*}}, null, null, i1 false, i1 true}
+// IGNORELIST: ![[DISABLE_INSTR_GLOBAL]] = !{{{.*disable_instrumentation_global.*}}, null, null, i1 false, i1 true}
+// IGNORELIST: ![[IGNORELISTED_GLOBAL]] = !{{{.*ignorelisted_global.*}}, null, null, i1 false, i1 true}
+// IGNORELIST: ![[STATIC_VAR]] = !{{{.*}} null, null, i1 false, i1 true}
+// IGNORELIST: ![[LITERAL]] = !{{{.*}} null, null, i1 false, i1 true}

compiler-rt/test/hwasan/TestCases/global-with-reduction.c

 // RUN: %clang_hwasan %s -o %t
 // RUN: %run %t 0
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: not %env_hwasan_opts=symbolize=0 %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RNOSYM %s
 // RUN: not %run %t -1 2>&1 | FileCheck --check-prefixes=CHECK,LSYM %s
 // RUN: not %env_hwasan_opts=symbolize=0 %run %t -1 2>&1 | FileCheck --check-prefixes=CHECK,LNOSYM %s
 
 // Test with and without optimizations, with and without PIC, since different
 // backend passes run depending on these flags.
 // RUN: %clang_hwasan -fno-pic %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: %clang_hwasan -fno-pic -O2 %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: %clang_hwasan -O2 %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t && %run %t 0
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -fno-pic && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -O2 && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -fno-pic -O2 && %run %t 1
+
 // REQUIRES: pointer-tagging
 
-int x = 1;
+#include <stdlib.h>
 
-int atoi(const char *);
+// GlobalOpt may replace the current GV with a new boolean-typed GV. Previously,
+// this resulted in the "nosanitize" getting dropped because while the data/code
+// references to the GV were updated, the old metadata references weren't.
+int* f() {
+#ifdef USE_NOSANITIZE
+__attribute__((no_sanitize("hwaddress"))) static int x = 1;
+#else // USE_NOSANITIZE
+  static int x = 1;
+#endif // USE_NOSANITIZE
+  if (x == 1) x = 0;
+  return &x;
+}
 
 int main(int argc, char **argv) {
   // CHECK: Cause: global-overflow
-  // RSYM: is located 0 bytes to the right of 4-byte global variable x {{.*}} in {{.*}}global.c.tmp
+  // RSYM: is located 0 bytes to the right of 4-byte global variable f.x {{.*}} in {{.*}}global-with-reduction.c.tmp
   // RNOSYM: is located to the right of a 4-byte global variable in
-  // RNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global.c.tmp+{{.*}})
-  // LSYM: is located 4 bytes to the left of 4-byte global variable x {{.*}} in {{.*}}global.c.tmp
+  // RNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global-with-reduction.c.tmp+{{.*}})
+  // LSYM: is located 4 bytes to the left of 4-byte global variable f.x {{.*}} in {{.*}}global-with-reduction.c.tmp
   // LNOSYM: is located to the left of a 4-byte global variable in
-  // LNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global.c.tmp+{{.*}})
+  // LNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global-with-reduction.c.tmp+{{.*}})
   // CHECK-NOT: can not describe
-  (&x)[atoi(argv[1])] = 1;
+  f()[atoi(argv[1])] = 1;
+  return 0;
 }

compiler-rt/test/hwasan/TestCases/global.c

 // RUN: %clang_hwasan %s -o %t
 // RUN: %run %t 0
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: not %env_hwasan_opts=symbolize=0 %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RNOSYM %s
 // RUN: not %run %t -1 2>&1 | FileCheck --check-prefixes=CHECK,LSYM %s
 // RUN: not %env_hwasan_opts=symbolize=0 %run %t -1 2>&1 | FileCheck --check-prefixes=CHECK,LNOSYM %s
 
 // Test with and without optimizations, with and without PIC, since different
 // backend passes run depending on these flags.
 // RUN: %clang_hwasan -fno-pic %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: %clang_hwasan -fno-pic -O2 %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 // RUN: %clang_hwasan -O2 %s -o %t
 // RUN: not %run %t 1 2>&1 | FileCheck --check-prefixes=CHECK,RSYM %s
 
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t && %run %t 0
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -fno-pic && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -O2 && %run %t 1
+// RUN: %clang_hwasan -DUSE_NOSANITIZE %s -o %t -fno-pic -O2 && %run %t 1
+
 // REQUIRES: pointer-tagging
 
+#include <stdlib.h>
+
+int a = 1;
+#ifdef USE_NOSANITIZE
+__attribute__((no_sanitize("hwaddress"))) int x = 1;
+#else // USE_NOSANITIZE
 int x = 1;
+#endif // USE_NOSANITIZE
+int b = 1;
 
 int atoi(const char *);
 
 int main(int argc, char **argv) {
   // CHECK: Cause: global-overflow
   // RSYM: is located 0 bytes to the right of 4-byte global variable x {{.*}} in {{.*}}global.c.tmp
   // RNOSYM: is located to the right of a 4-byte global variable in
   // RNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global.c.tmp+{{.*}})
   // LSYM: is located 4 bytes to the left of 4-byte global variable x {{.*}} in {{.*}}global.c.tmp
   // LNOSYM: is located to the left of a 4-byte global variable in
   // LNOSYM-NEXT: #0 0x{{.*}} ({{.*}}global.c.tmp+{{.*}})
   // CHECK-NOT: can not describe
   (&x)[atoi(argv[1])] = 1;
+  return 0;
 }