[asan] Append line number to variable name if line is available and in the same file as the function.

PR30498

Reviewers: eugenis

Differential Revision: https://reviews.llvm.org/D25715

llvm-svn: 284546

1 files changed, 22 insertions, 21 deletions

diff --git a/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp b/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
index 4a8e15d9c86..a241482c18e 100644
--- a/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
+++ b/llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
@@ -37,40 +37,41 @@ ShadowBytesToString(ArrayRef<uint8_t> ShadowBytes) {
     SmallVector<ASanStackVariableDescription, 10> Vars = V;                    \
     ASanStackFrameLayout L =                                                   \
         ComputeASanStackFrameLayout(Vars, Granularity, MinHeaderSize);         \
-    EXPECT_EQ(ExpectedDescr, L.DescriptionString);                             \
+    EXPECT_STREQ(ExpectedDescr, L.DescriptionString.c_str());                  \
     EXPECT_EQ(ExpectedShadow, ShadowBytesToString(GetShadowBytes(Vars, L)));   \
     EXPECT_EQ(ExpectedShadowAfterScope,                                        \
               ShadowBytesToString(GetShadowBytesAfterScope(Vars, L)));         \
   }
 
 TEST(ASanStackFrameLayout, Test) {
-#define VAR(name, size, lifetime, alignment)                                   \
+#define VAR(name, size, lifetime, alignment, line)                             \
   ASanStackVariableDescription name##size##_##alignment = {                    \
     #name #size "_" #alignment,                                                \
     size,                                                                      \
     lifetime,                                                                  \
     alignment,                                                                 \
     0,                                                                         \
-    0                                                                          \
+    0,                                                                         \
+    line,                                                                      \
   }
 
-  VAR(a, 1, 0, 1);
-  VAR(p, 1, 0, 32);
-  VAR(p, 1, 0, 256);
-  VAR(a, 2, 0, 1);
-  VAR(a, 3, 0, 1);
-  VAR(a, 4, 0, 1);
-  VAR(a, 7, 0, 1);
-  VAR(a, 8, 8, 1);
-  VAR(a, 9, 0, 1);
-  VAR(a, 16, 16, 1);
-  VAR(a, 41, 9, 1);
-  VAR(a, 105, 103, 1);
+  VAR(a, 1, 0, 1, 0);
+  VAR(p, 1, 0, 32, 15);
+  VAR(p, 1, 0, 256, 2700);
+  VAR(a, 2, 0, 1, 0);
+  VAR(a, 3, 0, 1, 0);
+  VAR(a, 4, 0, 1, 0);
+  VAR(a, 7, 0, 1, 0);
+  VAR(a, 8, 8, 1, 0);
+  VAR(a, 9, 0, 1, 0);
+  VAR(a, 16, 16, 1, 0);
+  VAR(a, 41, 9, 1, 7);
+  VAR(a, 105, 103, 1, 0);
 
   TEST_LAYOUT({a1_1}, 8, 16, "1 16 1 4 a1_1", "LL1R", "LL1R");
   TEST_LAYOUT({a1_1}, 64, 64, "1 64 1 4 a1_1", "L1", "L1");
-  TEST_LAYOUT({p1_32}, 8, 32, "1 32 1 5 p1_32", "LLLL1RRR", "LLLL1RRR");
-  TEST_LAYOUT({p1_32}, 8, 64, "1 64 1 5 p1_32", "LLLLLLLL1RRRRRRR",
+  TEST_LAYOUT({p1_32}, 8, 32, "1 32 1 8 p1_32:15", "LLLL1RRR", "LLLL1RRR");
+  TEST_LAYOUT({p1_32}, 8, 64, "1 64 1 8 p1_32:15", "LLLLLLLL1RRRRRRR",
               "LLLLLLLL1RRRRRRR");
 
   TEST_LAYOUT({a1_1}, 8, 32, "1 32 1 4 a1_1", "LLLL1RRR", "LLLL1RRR");
@@ -81,24 +82,24 @@ TEST(ASanStackFrameLayout, Test) {
   TEST_LAYOUT({a8_1}, 8, 32, "1 32 8 4 a8_1", "LLLL0RRR", "LLLLSRRR");
   TEST_LAYOUT({a9_1}, 8, 32, "1 32 9 4 a9_1", "LLLL01RR", "LLLL01RR");
   TEST_LAYOUT({a16_1}, 8, 32, "1 32 16 5 a16_1", "LLLL00RR", "LLLLSSRR");
-  TEST_LAYOUT({p1_256}, 8, 32, "1 256 1 6 p1_256",
+  TEST_LAYOUT({p1_256}, 8, 32, "1 256 1 11 p1_256:2700",
               "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR",
               "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR");
-  TEST_LAYOUT({a41_1}, 8, 32, "1 32 41 5 a41_1", "LLLL000001RRRRRR",
+  TEST_LAYOUT({a41_1}, 8, 32, "1 32 41 7 a41_1:7", "LLLL000001RRRRRR",
               "LLLLSS0001RRRRRR");
   TEST_LAYOUT({a105_1}, 8, 32, "1 32 105 6 a105_1", "LLLL00000000000001RRRRRR",
               "LLLLSSSSSSSSSSSSS1RRRRRR");
 
   {
     SmallVector<ASanStackVariableDescription, 10> t = {a1_1, p1_256};
-    TEST_LAYOUT(t, 8, 32, "2 256 1 6 p1_256 272 1 4 a1_1",
+    TEST_LAYOUT(t, 8, 32, "2 256 1 11 p1_256:2700 272 1 4 a1_1",
                 "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R",
                 "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R");
   }
 
   {
     SmallVector<ASanStackVariableDescription, 10> t = {a1_1, a16_1, a41_1};
-    TEST_LAYOUT(t, 8, 32, "3 32 1 4 a1_1 48 16 5 a16_1 80 41 5 a41_1",
+    TEST_LAYOUT(t, 8, 32, "3 32 1 4 a1_1 48 16 5 a16_1 80 41 7 a41_1:7",
                 "LLLL1M00MM000001RRRR", "LLLL1MSSMMSS0001RRRR");
   }
 #undef VAR