caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[asan] Separate calculation of ShadowBytes from calculating ASanStackFrameLayout

Browse Source 
Summary: No functional changes, just refactoring to make D23947 simpler.

Reviewers: eugenis

Subscribers: llvm-commits

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

llvm-svn: 279982
This commit is contained in:
Vitaly Buka
2016-08-29 17:41:29 +00:00
parent ac644fa917
commit db331d8be7
4 changed files with 115 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
llvm/unittests/Transforms/Utils/ASanStackFrameLayoutTest.cpp
View File

@@ -30,21 +30,20 @@ ShadowBytesToString(ArrayRef<uint8_t> ShadowBytes) {
return os.str();
}
static void TestLayout(SmallVector<ASanStackVariableDescription, 10> Vars,
size_t Granularity, size_t MinHeaderSize,
const std::string &ExpectedDescr,
const std::string &ExpectedShadow) {
ASanStackFrameLayout L;
ComputeASanStackFrameLayout(Vars, Granularity, MinHeaderSize, &L);
EXPECT_EQ(ExpectedDescr, L.DescriptionString);
EXPECT_EQ(ExpectedShadow, ShadowBytesToString(L.ShadowBytes));
}
// Use macro to preserve line information in EXPECT_EQ output.
#define TEST_LAYOUT(V, Granularity, MinHeaderSize, ExpectedDescr, \
ExpectedShadow, ExpectedShadowAfterScope) \
{ \
SmallVector<ASanStackVariableDescription, 10> Vars = V; \
ASanStackFrameLayout L = \
ComputeASanStackFrameLayout(Vars, Granularity, MinHeaderSize); \
EXPECT_EQ(ExpectedDescr, L.DescriptionString); \
EXPECT_EQ(ExpectedShadow, ShadowBytesToString(GetShadowBytes(Vars, L))); \
EXPECT_EQ(ExpectedShadowAfterScope, \
ShadowBytesToString(GetShadowBytesAfterScope(Vars, L))); \
}
TEST(ASanStackFrameLayout, Test) {
#define VEC1(a) SmallVector<ASanStackVariableDescription, 10>(1, a)
#define VEC(a) \
SmallVector<ASanStackVariableDescription, 10>(a, a + sizeof(a) / sizeof(a[0]))
#define VAR(name, size, lifetime, alignment) \
ASanStackVariableDescription name##size##_##alignment = { \
#name #size "_" #alignment, \
@@ -64,41 +63,44 @@ TEST(ASanStackFrameLayout, Test) {
VAR(a, 7, 0, 1);
VAR(a, 8, 8, 1);
VAR(a, 9, 0, 1);
VAR(a, 16, 0, 1);
VAR(a, 16, 16, 1);
VAR(a, 41, 9, 1);
VAR(a, 105, 103, 1);
TestLayout(VEC1(a1_1), 8, 16, "1 16 1 4 a1_1", "LL1R");
TestLayout(VEC1(a1_1), 64, 64, "1 64 1 4 a1_1", "L1");
TestLayout(VEC1(p1_32), 8, 32, "1 32 1 5 p1_32", "LLLL1RRR");
TestLayout(VEC1(p1_32), 8, 64, "1 64 1 5 p1_32", "LLLLLLLL1RRRRRRR");
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",
"LLLLLLLL1RRRRRRR");
TestLayout(VEC1(a1_1), 8, 32, "1 32 1 4 a1_1", "LLLL1RRR");
TestLayout(VEC1(a2_1), 8, 32, "1 32 2 4 a2_1", "LLLL2RRR");
TestLayout(VEC1(a3_1), 8, 32, "1 32 3 4 a3_1", "LLLL3RRR");
TestLayout(VEC1(a4_1), 8, 32, "1 32 4 4 a4_1", "LLLL4RRR");
TestLayout(VEC1(a7_1), 8, 32, "1 32 7 4 a7_1", "LLLL7RRR");
TestLayout(VEC1(a8_1), 8, 32, "1 32 8 4 a8_1", "LLLLSRRR");
TestLayout(VEC1(a9_1), 8, 32, "1 32 9 4 a9_1", "LLLL01RR");
TestLayout(VEC1(a16_1), 8, 32, "1 32 16 5 a16_1", "LLLL00RR");
TestLayout(VEC1(p1_256), 8, 32, "1 256 1 6 p1_256",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR");
TestLayout(VEC1(a41_1), 8, 32, "1 32 41 5 a41_1", "LLLLSS0001RRRRRR");
TestLayout(VEC1(a105_1), 8, 32, "1 32 105 6 a105_1",
"LLLLSSSSSSSSSSSSS1RRRRRR");
TEST_LAYOUT({a1_1}, 8, 32, "1 32 1 4 a1_1", "LLLL1RRR", "LLLL1RRR");
TEST_LAYOUT({a2_1}, 8, 32, "1 32 2 4 a2_1", "LLLL2RRR", "LLLL2RRR");
TEST_LAYOUT({a3_1}, 8, 32, "1 32 3 4 a3_1", "LLLL3RRR", "LLLL3RRR");
TEST_LAYOUT({a4_1}, 8, 32, "1 32 4 4 a4_1", "LLLL4RRR", "LLLL4RRR");
TEST_LAYOUT({a7_1}, 8, 32, "1 32 7 4 a7_1", "LLLL7RRR", "LLLL7RRR");
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",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1RRR");
TEST_LAYOUT({a41_1}, 8, 32, "1 32 41 5 a41_1", "LLLL000001RRRRRR",
"LLLLSS0001RRRRRR");
TEST_LAYOUT({a105_1}, 8, 32, "1 32 105 6 a105_1", "LLLL00000000000001RRRRRR",
"LLLLSSSSSSSSSSSSS1RRRRRR");
{
ASanStackVariableDescription t[] = {a1_1, p1_256};
TestLayout(VEC(t), 8, 32, "2 256 1 6 p1_256 272 1 4 a1_1",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R");
SmallVector<ASanStackVariableDescription, 10> t = {a1_1, p1_256};
TEST_LAYOUT(t, 8, 32, "2 256 1 6 p1_256 272 1 4 a1_1",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R",
"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL1M1R");
}
{
ASanStackVariableDescription t[] = {a1_1, a16_1, a41_1};
TestLayout(VEC(t), 8, 32, "3 32 1 4 a1_1 48 16 5 a16_1 80 41 5 a41_1",
"LLLL1M00MMSS0001RRRR");
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",
"LLLL1M00MM000001RRRR", "LLLL1MSSMMSS0001RRRR");
}
#undef VEC1
#undef VEC
#undef VAR
#undef TEST_LAYOUT
}