Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Reapply [hwasan] Update dbg.assign intrinsics in HWAsan pass … #79186

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Revert "Reapply [hwasan] Update dbg.assign intrinsics in HWAsan pass … #79186

merged 1 commit into from
Jan 23, 2024

Conversation

gulfemsavrun
Copy link
Contributor

…#78606"

This reverts commit 13c6f1e because it causes an assertion in DebugInfoMetadata.cpp:1968 in Clang Linux builders for Fuchsia.
https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket/8758111613576762817/+/u/clang/build/stdout

@gulfemsavrun gulfemsavrun merged commit 7fe951a into llvm:main Jan 23, 2024
4 of 5 checks passed
@llvmbot
Copy link
Collaborator

llvmbot commented Jan 23, 2024 •
edited

@llvm/pr-subscribers-backend-aarch64
@llvm/pr-subscribers-llvm-ir
@llvm/pr-subscribers-compiler-rt-sanitizer

@llvm/pr-subscribers-llvm-transforms

Author: None (gulfemsavrun)

Changes

…#78606"

This reverts commit 13c6f1e because it causes an assertion in DebugInfoMetadata.cpp:1968 in Clang Linux builders for Fuchsia.
https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket/8758111613576762817/+/u/clang/build/stdout

Full diff: https://github.com/llvm/llvm-project/pull/79186.diff

7 Files Affected:

  • (modified) llvm/lib/IR/DebugInfo.cpp (+4)
  • (modified) llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp (-5)
  • (modified) llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp (+3-7)
  • (removed) llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll (-71)
  • (removed) llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll (-71)
  • (modified) llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll (+1-1)
  • (removed) llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll (-59)
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index e33274895ef436e..53cbf01918969b0 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -2211,6 +2211,10 @@ bool AssignmentTrackingPass::runOnFunction(Function &F) {
   if (F.hasFnAttribute(Attribute::OptimizeNone))
     return /*Changed*/ false;
 
+  // FIXME: https://github.com/llvm/llvm-project/issues/76545
+  if (F.hasFnAttribute(Attribute::SanitizeHWAddress))
+    return /*Changed*/ false;
+
   bool Changed = false;
   auto *DL = &F.getParent()->getDataLayout();
   // Collect a map of {backing storage : dbg.declares} (currently "backing
diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
index 3ca9c402b47194e..efb621cde906563 100644
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -1435,11 +1435,6 @@ bool HWAddressSanitizer::instrumentStack(memtag::StackInfo &SInfo,
         if (DDI->getVariableLocationOp(LocNo) == AI)
           DDI->setExpression(DIExpression::appendOpsToArg(DDI->getExpression(),
                                                           NewOps, LocNo));
-      if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(DDI)) {
-        if (DAI->getAddress() == AI)
-          DAI->setAddressExpression(DIExpression::prependOpcodes(
-              DAI->getAddressExpression(), NewOps));
-      }
     }
 
     auto TagEnd = [&](Instruction *Node) {
diff --git a/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp b/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
index d2efcde5d380329..f94047633022cad 100644
--- a/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
+++ b/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
@@ -138,20 +138,16 @@ void StackInfoBuilder::visit(Instruction &Inst) {
     return;
   }
   if (auto *DVI = dyn_cast<DbgVariableIntrinsic>(&Inst)) {
-    auto AddIfInteresting = [&](Value *V) {
+    for (Value *V : DVI->location_ops()) {
       if (auto *AI = dyn_cast_or_null<AllocaInst>(V)) {
         if (!isInterestingAlloca(*AI))
-          return;
+          continue;
         AllocaInfo &AInfo = Info.AllocasToInstrument[AI];
         auto &DVIVec = AInfo.DbgVariableIntrinsics;
         if (DVIVec.empty() || DVIVec.back() != DVI)
           DVIVec.push_back(DVI);
       }
-    };
-    for (Value *V : DVI->location_ops())
-      AddIfInteresting(V);
-    if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(DVI))
-      AddIfInteresting(DAI->getAddress());
+    }
   }
   Instruction *ExitUntag = getUntagLocationIfFunctionExit(Inst);
   if (ExitUntag)
diff --git a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll b/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll
deleted file mode 100644
index ef0dd46cb45c7f8..000000000000000
--- a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
-
-;; Similar to dbg-assign-tag-offset.ll except the variable 'x' has been removed
-;; and 'y' has an implicit location range as well as stack location range
-;; (according to the hand-modified debug info -- see the dbg.value).
-
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-unknown-linux-android24"
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x80)
-; CHECK-NEXT:   DW_AT_name    ("y")
-
-define dso_local void @f() !dbg !14 {
-  %1 = alloca i32, align 4, !DIAssignID !31
-  %2 = alloca i32, align 4, !DIAssignID !32
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !20, metadata !DIExpression(), metadata !32, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @llvm.dbg.value(metadata i32 2, metadata !20, metadata !DIExpression()), !dbg !22
-  call void @use(ptr null), !dbg !28
-  store i32 1, ptr %2, align 4, !dbg !23, !tbaa !24, !DIAssignID !33
-  call void @llvm.dbg.assign(metadata i32 1, metadata !20, metadata !DIExpression(), metadata !33, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @use(ptr nonnull %1), !dbg !28
-  call void @use(ptr nonnull %2), !dbg !29
-  ret void, !dbg !30
-}
-
-declare !dbg !5 void @use(ptr)
-
-declare void @llvm.dbg.value(metadata, metadata, metadata)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata)
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!8, !9, !10, !11, !12, !34}
-!llvm.ident = !{!13}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
-!1 = !DIFile(filename: "dbg.cc", directory: "/tmp")
-!2 = !{}
-!3 = !{!4, !5}
-!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
-!5 = !DISubprogram(name: "use", scope: !1, file: !1, line: 2, type: !6, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
-!6 = !DISubroutineType(types: !7)
-!7 = !{null, !4}
-!8 = !{i32 7, !"Dwarf Version", i32 4}
-!9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = !{i32 1, !"wchar_size", i32 4}
-!11 = !{i32 7, !"PIC Level", i32 2}
-!12 = !{i32 7, !"PIE Level", i32 2}
-!13 = !{!"clang version 10.0.0"}
-!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17)
-!15 = !DISubroutineType(types: !16)
-!16 = !{null}
-!17 = !{!18, !20}
-!18 = !DILocalVariable(name: "x", scope: !14, file: !1, line: 5, type: !19)
-!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!20 = !DILocalVariable(name: "y", scope: !14, file: !1, line: 5, type: !19)
-!21 = !DILocation(line: 5, column: 3, scope: !14)
-!22 = !DILocation(line: 0, scope: !14)
-!23 = !DILocation(line: 5, column: 10, scope: !14)
-!24 = !{!25, !25, i64 0}
-!25 = !{!"int", !26, i64 0}
-!26 = !{!"omnipotent char", !27, i64 0}
-!27 = !{!"Simple C++ TBAA"}
-!28 = !DILocation(line: 6, column: 3, scope: !14)
-!29 = !DILocation(line: 7, column: 3, scope: !14)
-!30 = !DILocation(line: 8, column: 1, scope: !14)
-!31 = distinct !DIAssignID()
-!32 = distinct !DIAssignID()
-!33 = distinct !DIAssignID()
-!34 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
diff --git a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll b/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll
deleted file mode 100644
index a587f93d14d70d0..000000000000000
--- a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
-
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-unknown-linux-android24"
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x00)
-; CHECK-NEXT:   DW_AT_name    ("x")
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x80)
-; CHECK-NEXT:   DW_AT_name    ("y")
-
-define dso_local void @f() !dbg !14 {
-  %1 = alloca i32, align 4, !DIAssignID !31
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !18, metadata !DIExpression(), metadata !31, metadata ptr %1, metadata !DIExpression(DW_OP_LLVM_tag_offset, 0)), !dbg !22
-  %2 = alloca i32, align 4, !DIAssignID !32
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !20, metadata !DIExpression(), metadata !32, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  store i32 1, ptr %2, align 4, !dbg !23, !tbaa !24, !DIAssignID !33
-  call void @llvm.dbg.assign(metadata i32 1, metadata !20, metadata !DIExpression(), metadata !33, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @use(ptr nonnull %1), !dbg !28
-  call void @use(ptr nonnull %2), !dbg !29
-  ret void, !dbg !30
-}
-
-declare !dbg !5 void @use(ptr)
-
-declare void @llvm.dbg.value(metadata, metadata, metadata)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata)
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!8, !9, !10, !11, !12, !34}
-!llvm.ident = !{!13}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
-!1 = !DIFile(filename: "dbg.cc", directory: "/tmp")
-!2 = !{}
-!3 = !{!4, !5}
-!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
-!5 = !DISubprogram(name: "use", scope: !1, file: !1, line: 2, type: !6, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
-!6 = !DISubroutineType(types: !7)
-!7 = !{null, !4}
-!8 = !{i32 7, !"Dwarf Version", i32 4}
-!9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = !{i32 1, !"wchar_size", i32 4}
-!11 = !{i32 7, !"PIC Level", i32 2}
-!12 = !{i32 7, !"PIE Level", i32 2}
-!13 = !{!"clang version 10.0.0"}
-!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17)
-!15 = !DISubroutineType(types: !16)
-!16 = !{null}
-!17 = !{!18, !20}
-!18 = !DILocalVariable(name: "x", scope: !14, file: !1, line: 5, type: !19)
-!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!20 = !DILocalVariable(name: "y", scope: !14, file: !1, line: 5, type: !19)
-!21 = !DILocation(line: 5, column: 3, scope: !14)
-!22 = !DILocation(line: 0, scope: !14)
-!23 = !DILocation(line: 5, column: 10, scope: !14)
-!24 = !{!25, !25, i64 0}
-!25 = !{!"int", !26, i64 0}
-!26 = !{!"omnipotent char", !27, i64 0}
-!27 = !{!"Simple C++ TBAA"}
-!28 = !DILocation(line: 6, column: 3, scope: !14)
-!29 = !DILocation(line: 7, column: 3, scope: !14)
-!30 = !DILocation(line: 8, column: 1, scope: !14)
-!31 = distinct !DIAssignID()
-!32 = distinct !DIAssignID()
-!33 = distinct !DIAssignID()
-!34 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
diff --git a/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
index 6c9366609cba274..c4b209de7701735 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
@@ -1,6 +1,6 @@
 ; RUN: opt %s -S -passes=declare-to-assign -o - | FileCheck %s
 
-; CHECK: call void @llvm.dbg.assign
+; CHECK: call void @llvm.dbg.declare
 
 define dso_local void @f() sanitize_hwaddress !dbg !9 {
 entry:
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll b/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll
deleted file mode 100644
index f91d2aa110a87ab..000000000000000
--- a/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll
+++ /dev/null
@@ -1,59 +0,0 @@
-; RUN: opt -passes=hwasan -S -o - %s | FileCheck %s
-
-source_filename = "test.ll"
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64--linux-android"
-
-declare void @g(ptr, ptr, ptr, ptr, ptr, ptr)
-
-; Function Attrs: sanitize_hwaddress
-define void @f() #0 !dbg !7 {
-entry:
-  %nodebug0 = alloca ptr, align 8
-  %nodebug1 = alloca ptr, align 8
-  %nodebug2 = alloca ptr, align 8
-  %nodebug3 = alloca ptr, align 8
-  ; CHECK: %a = alloca{{.*}} !DIAssignID ![[ID1:[0-9]+]]
-  %a = alloca ptr, align 8, !DIAssignID !13
-  ; CHECK: @llvm.dbg.assign{{.*}} metadata ![[ID1]]{{.*}} !DIExpression(DW_OP_LLVM_tag_offset, 32)
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !14, metadata !DIExpression(), metadata !13, metadata ptr %a, metadata !DIExpression()), !dbg !15
-  ; CHECK: %b = alloca{{.*}} !DIAssignID ![[ID2:[0-9]+]]
-  %b = alloca ptr, align 8, !DIAssignID !16
-  ; CHECK: @llvm.dbg.assign{{.*}} metadata ![[ID2]]{{.*}} !DIExpression(DW_OP_LLVM_tag_offset, 96)
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !17, metadata !DIExpression(DW_OP_plus_uconst, 1), metadata !16, metadata ptr %b, metadata !DIExpression()), !dbg !15
-  call void @g(ptr %nodebug0, ptr %nodebug1, ptr %nodebug2, ptr %nodebug3, ptr %a, ptr %b)
-  ret void, !dbg !18
-}
-
-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
-
-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata) #1
-
-attributes #0 = { sanitize_hwaddress }
-attributes #1 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!3, !4, !5}
-!llvm.ident = !{!6}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-!1 = !DIFile(filename: "x.c", directory: "/")
-!2 = !{}
-!3 = !{i32 2, !"Dwarf Version", i32 4}
-!4 = !{i32 2, !"Debug Info Version", i32 3}
-!5 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
-!6 = !{!"clang"}
-!7 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
-!8 = !DISubroutineType(types: !9)
-!9 = !{null, !10}
-!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
-!11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !12)
-!12 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
-!13 = distinct !DIAssignID()
-!14 = !DILocalVariable(name: "a", scope: !7, file: !1, line: 1, type: !10)
-!15 = !DILocation(line: 0, scope: !7)
-!16 = distinct !DIAssignID()
-!17 = !DILocalVariable(name: "b", scope: !7, file: !1, line: 1, type: !10)
-!18 = !DILocation(line: 1, column: 37, scope: !7)

@llvmbot
Copy link
Collaborator

llvmbot commented Jan 23, 2024

@llvm/pr-subscribers-debuginfo

Author: None (gulfemsavrun)

Changes

…#78606"

This reverts commit 13c6f1e because it causes an assertion in DebugInfoMetadata.cpp:1968 in Clang Linux builders for Fuchsia.
https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket/8758111613576762817/+/u/clang/build/stdout

Full diff: https://github.com/llvm/llvm-project/pull/79186.diff

7 Files Affected:

  • (modified) llvm/lib/IR/DebugInfo.cpp (+4)
  • (modified) llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp (-5)
  • (modified) llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp (+3-7)
  • (removed) llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll (-71)
  • (removed) llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll (-71)
  • (modified) llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll (+1-1)
  • (removed) llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll (-59)
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index e33274895ef436e..53cbf01918969b0 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -2211,6 +2211,10 @@ bool AssignmentTrackingPass::runOnFunction(Function &F) {
   if (F.hasFnAttribute(Attribute::OptimizeNone))
     return /*Changed*/ false;
 
+  // FIXME: https://github.com/llvm/llvm-project/issues/76545
+  if (F.hasFnAttribute(Attribute::SanitizeHWAddress))
+    return /*Changed*/ false;
+
   bool Changed = false;
   auto *DL = &F.getParent()->getDataLayout();
   // Collect a map of {backing storage : dbg.declares} (currently "backing
diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
index 3ca9c402b47194e..efb621cde906563 100644
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -1435,11 +1435,6 @@ bool HWAddressSanitizer::instrumentStack(memtag::StackInfo &SInfo,
         if (DDI->getVariableLocationOp(LocNo) == AI)
           DDI->setExpression(DIExpression::appendOpsToArg(DDI->getExpression(),
                                                           NewOps, LocNo));
-      if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(DDI)) {
-        if (DAI->getAddress() == AI)
-          DAI->setAddressExpression(DIExpression::prependOpcodes(
-              DAI->getAddressExpression(), NewOps));
-      }
     }
 
     auto TagEnd = [&](Instruction *Node) {
diff --git a/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp b/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
index d2efcde5d380329..f94047633022cad 100644
--- a/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
+++ b/llvm/lib/Transforms/Utils/MemoryTaggingSupport.cpp
@@ -138,20 +138,16 @@ void StackInfoBuilder::visit(Instruction &Inst) {
     return;
   }
   if (auto *DVI = dyn_cast<DbgVariableIntrinsic>(&Inst)) {
-    auto AddIfInteresting = [&](Value *V) {
+    for (Value *V : DVI->location_ops()) {
       if (auto *AI = dyn_cast_or_null<AllocaInst>(V)) {
         if (!isInterestingAlloca(*AI))
-          return;
+          continue;
         AllocaInfo &AInfo = Info.AllocasToInstrument[AI];
         auto &DVIVec = AInfo.DbgVariableIntrinsics;
         if (DVIVec.empty() || DVIVec.back() != DVI)
           DVIVec.push_back(DVI);
       }
-    };
-    for (Value *V : DVI->location_ops())
-      AddIfInteresting(V);
-    if (auto *DAI = dyn_cast<DbgAssignIntrinsic>(DVI))
-      AddIfInteresting(DAI->getAddress());
+    }
   }
   Instruction *ExitUntag = getUntagLocationIfFunctionExit(Inst);
   if (ExitUntag)
diff --git a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll b/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll
deleted file mode 100644
index ef0dd46cb45c7f8..000000000000000
--- a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset-mix-loc.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
-
-;; Similar to dbg-assign-tag-offset.ll except the variable 'x' has been removed
-;; and 'y' has an implicit location range as well as stack location range
-;; (according to the hand-modified debug info -- see the dbg.value).
-
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-unknown-linux-android24"
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x80)
-; CHECK-NEXT:   DW_AT_name    ("y")
-
-define dso_local void @f() !dbg !14 {
-  %1 = alloca i32, align 4, !DIAssignID !31
-  %2 = alloca i32, align 4, !DIAssignID !32
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !20, metadata !DIExpression(), metadata !32, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @llvm.dbg.value(metadata i32 2, metadata !20, metadata !DIExpression()), !dbg !22
-  call void @use(ptr null), !dbg !28
-  store i32 1, ptr %2, align 4, !dbg !23, !tbaa !24, !DIAssignID !33
-  call void @llvm.dbg.assign(metadata i32 1, metadata !20, metadata !DIExpression(), metadata !33, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @use(ptr nonnull %1), !dbg !28
-  call void @use(ptr nonnull %2), !dbg !29
-  ret void, !dbg !30
-}
-
-declare !dbg !5 void @use(ptr)
-
-declare void @llvm.dbg.value(metadata, metadata, metadata)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata)
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!8, !9, !10, !11, !12, !34}
-!llvm.ident = !{!13}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
-!1 = !DIFile(filename: "dbg.cc", directory: "/tmp")
-!2 = !{}
-!3 = !{!4, !5}
-!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
-!5 = !DISubprogram(name: "use", scope: !1, file: !1, line: 2, type: !6, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
-!6 = !DISubroutineType(types: !7)
-!7 = !{null, !4}
-!8 = !{i32 7, !"Dwarf Version", i32 4}
-!9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = !{i32 1, !"wchar_size", i32 4}
-!11 = !{i32 7, !"PIC Level", i32 2}
-!12 = !{i32 7, !"PIE Level", i32 2}
-!13 = !{!"clang version 10.0.0"}
-!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17)
-!15 = !DISubroutineType(types: !16)
-!16 = !{null}
-!17 = !{!18, !20}
-!18 = !DILocalVariable(name: "x", scope: !14, file: !1, line: 5, type: !19)
-!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!20 = !DILocalVariable(name: "y", scope: !14, file: !1, line: 5, type: !19)
-!21 = !DILocation(line: 5, column: 3, scope: !14)
-!22 = !DILocation(line: 0, scope: !14)
-!23 = !DILocation(line: 5, column: 10, scope: !14)
-!24 = !{!25, !25, i64 0}
-!25 = !{!"int", !26, i64 0}
-!26 = !{!"omnipotent char", !27, i64 0}
-!27 = !{!"Simple C++ TBAA"}
-!28 = !DILocation(line: 6, column: 3, scope: !14)
-!29 = !DILocation(line: 7, column: 3, scope: !14)
-!30 = !DILocation(line: 8, column: 1, scope: !14)
-!31 = distinct !DIAssignID()
-!32 = distinct !DIAssignID()
-!33 = distinct !DIAssignID()
-!34 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
diff --git a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll b/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll
deleted file mode 100644
index a587f93d14d70d0..000000000000000
--- a/llvm/test/CodeGen/AArch64/dbg-assign-tag-offset.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: llc -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
-
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-unknown-linux-android24"
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x00)
-; CHECK-NEXT:   DW_AT_name    ("x")
-
-; CHECK:      DW_TAG_variable
-; CHECK-NOT:  DW_TAG
-; CHECK:        DW_AT_LLVM_tag_offset (0x80)
-; CHECK-NEXT:   DW_AT_name    ("y")
-
-define dso_local void @f() !dbg !14 {
-  %1 = alloca i32, align 4, !DIAssignID !31
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !18, metadata !DIExpression(), metadata !31, metadata ptr %1, metadata !DIExpression(DW_OP_LLVM_tag_offset, 0)), !dbg !22
-  %2 = alloca i32, align 4, !DIAssignID !32
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !20, metadata !DIExpression(), metadata !32, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  store i32 1, ptr %2, align 4, !dbg !23, !tbaa !24, !DIAssignID !33
-  call void @llvm.dbg.assign(metadata i32 1, metadata !20, metadata !DIExpression(), metadata !33, metadata ptr %2, metadata !DIExpression(DW_OP_LLVM_tag_offset, 128)), !dbg !22
-  call void @use(ptr nonnull %1), !dbg !28
-  call void @use(ptr nonnull %2), !dbg !29
-  ret void, !dbg !30
-}
-
-declare !dbg !5 void @use(ptr)
-
-declare void @llvm.dbg.value(metadata, metadata, metadata)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata)
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!8, !9, !10, !11, !12, !34}
-!llvm.ident = !{!13}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 10.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
-!1 = !DIFile(filename: "dbg.cc", directory: "/tmp")
-!2 = !{}
-!3 = !{!4, !5}
-!4 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
-!5 = !DISubprogram(name: "use", scope: !1, file: !1, line: 2, type: !6, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
-!6 = !DISubroutineType(types: !7)
-!7 = !{null, !4}
-!8 = !{i32 7, !"Dwarf Version", i32 4}
-!9 = !{i32 2, !"Debug Info Version", i32 3}
-!10 = !{i32 1, !"wchar_size", i32 4}
-!11 = !{i32 7, !"PIC Level", i32 2}
-!12 = !{i32 7, !"PIE Level", i32 2}
-!13 = !{!"clang version 10.0.0"}
-!14 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 4, type: !15, scopeLine: 4, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !17)
-!15 = !DISubroutineType(types: !16)
-!16 = !{null}
-!17 = !{!18, !20}
-!18 = !DILocalVariable(name: "x", scope: !14, file: !1, line: 5, type: !19)
-!19 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!20 = !DILocalVariable(name: "y", scope: !14, file: !1, line: 5, type: !19)
-!21 = !DILocation(line: 5, column: 3, scope: !14)
-!22 = !DILocation(line: 0, scope: !14)
-!23 = !DILocation(line: 5, column: 10, scope: !14)
-!24 = !{!25, !25, i64 0}
-!25 = !{!"int", !26, i64 0}
-!26 = !{!"omnipotent char", !27, i64 0}
-!27 = !{!"Simple C++ TBAA"}
-!28 = !DILocation(line: 6, column: 3, scope: !14)
-!29 = !DILocation(line: 7, column: 3, scope: !14)
-!30 = !DILocation(line: 8, column: 1, scope: !14)
-!31 = distinct !DIAssignID()
-!32 = distinct !DIAssignID()
-!33 = distinct !DIAssignID()
-!34 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
diff --git a/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll b/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
index 6c9366609cba274..c4b209de7701735 100644
--- a/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
+++ b/llvm/test/DebugInfo/Generic/assignment-tracking/declare-to-assign/hwasan.ll
@@ -1,6 +1,6 @@
 ; RUN: opt %s -S -passes=declare-to-assign -o - | FileCheck %s
 
-; CHECK: call void @llvm.dbg.assign
+; CHECK: call void @llvm.dbg.declare
 
 define dso_local void @f() sanitize_hwaddress !dbg !9 {
 entry:
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll b/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll
deleted file mode 100644
index f91d2aa110a87ab..000000000000000
--- a/llvm/test/Instrumentation/HWAddressSanitizer/dbg-assign-tag-offset.ll
+++ /dev/null
@@ -1,59 +0,0 @@
-; RUN: opt -passes=hwasan -S -o - %s | FileCheck %s
-
-source_filename = "test.ll"
-target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64--linux-android"
-
-declare void @g(ptr, ptr, ptr, ptr, ptr, ptr)
-
-; Function Attrs: sanitize_hwaddress
-define void @f() #0 !dbg !7 {
-entry:
-  %nodebug0 = alloca ptr, align 8
-  %nodebug1 = alloca ptr, align 8
-  %nodebug2 = alloca ptr, align 8
-  %nodebug3 = alloca ptr, align 8
-  ; CHECK: %a = alloca{{.*}} !DIAssignID ![[ID1:[0-9]+]]
-  %a = alloca ptr, align 8, !DIAssignID !13
-  ; CHECK: @llvm.dbg.assign{{.*}} metadata ![[ID1]]{{.*}} !DIExpression(DW_OP_LLVM_tag_offset, 32)
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !14, metadata !DIExpression(), metadata !13, metadata ptr %a, metadata !DIExpression()), !dbg !15
-  ; CHECK: %b = alloca{{.*}} !DIAssignID ![[ID2:[0-9]+]]
-  %b = alloca ptr, align 8, !DIAssignID !16
-  ; CHECK: @llvm.dbg.assign{{.*}} metadata ![[ID2]]{{.*}} !DIExpression(DW_OP_LLVM_tag_offset, 96)
-  call void @llvm.dbg.assign(metadata i1 undef, metadata !17, metadata !DIExpression(DW_OP_plus_uconst, 1), metadata !16, metadata ptr %b, metadata !DIExpression()), !dbg !15
-  call void @g(ptr %nodebug0, ptr %nodebug1, ptr %nodebug2, ptr %nodebug3, ptr %a, ptr %b)
-  ret void, !dbg !18
-}
-
-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
-
-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.assign(metadata, metadata, metadata, metadata, metadata, metadata) #1
-
-attributes #0 = { sanitize_hwaddress }
-attributes #1 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!3, !4, !5}
-!llvm.ident = !{!6}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
-!1 = !DIFile(filename: "x.c", directory: "/")
-!2 = !{}
-!3 = !{i32 2, !"Dwarf Version", i32 4}
-!4 = !{i32 2, !"Debug Info Version", i32 3}
-!5 = !{i32 7, !"debug-info-assignment-tracking", i1 true}
-!6 = !{!"clang"}
-!7 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
-!8 = !DISubroutineType(types: !9)
-!9 = !{null, !10}
-!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !11, size: 64)
-!11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !12)
-!12 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
-!13 = distinct !DIAssignID()
-!14 = !DILocalVariable(name: "a", scope: !7, file: !1, line: 1, type: !10)
-!15 = !DILocation(line: 0, scope: !7)
-!16 = distinct !DIAssignID()
-!17 = !DILocalVariable(name: "b", scope: !7, file: !1, line: 1, type: !10)
-!18 = !DILocation(line: 1, column: 37, scope: !7)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backend:AArch64 compiler-rt:sanitizer debuginfo llvm:ir llvm:transforms
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@gulfemsavrun @llvmbot