github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,c,cpp --
clang/test/CodeGen/cleanup-destslot-simple.c compiler-rt/lib/msan/msan.h
compiler-rt/lib/msan/msan_linux.cpp compiler-rt/test/msan/strlen_of_shadow.cpp
llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
--diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/compiler-rt/lib/msan/msan.h b/compiler-rt/lib/msan/msan.h
index 19f8d9b16..2b85c7d7f 100644
--- a/compiler-rt/lib/msan/msan.h
+++ b/compiler-rt/lib/msan/msan.h
@@ -233,23 +233,36 @@ const unsigned long kShadowOffset = 0x200000ULL;
// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000
// Heap at 0x700000000000.
const MappingDesc kMemoryLayout[] = {
- {0x000000000000ULL, 0x010000000000ULL - kShadowOffset, MappingDesc::APP,
"app-1"},
- {0x010000000000ULL - kShadowOffset, 0x010000000000ULL + kShadowOffset,
MappingDesc::INVALID, "gap"},
- {0x010000000000ULL + kShadowOffset, 0x100000000000ULL + kShadowOffset,
MappingDesc::SHADOW, "shadow-2"},
- {0x100000000000ULL + kShadowOffset, 0x110000000000ULL + kShadowOffset,
MappingDesc::INVALID, "invalid"},
- {0x110000000000ULL + kShadowOffset, 0x200000000000ULL + kShadowOffset,
MappingDesc::ORIGIN, "origin-2"},
- {0x200000000000ULL + kShadowOffset, 0x300000000000ULL + kShadowOffset,
MappingDesc::SHADOW, "shadow-3"},
- {0x300000000000ULL + kShadowOffset, 0x400000000000ULL + kShadowOffset,
MappingDesc::ORIGIN, "origin-3"},
- {0x400000000000ULL + kShadowOffset, 0x500000000000ULL + kShadowOffset,
MappingDesc::INVALID, "invalid"},
- {0x500000000000ULL + kShadowOffset, 0x510000000000ULL,
MappingDesc::SHADOW, "shadow-1"},
- {0x510000000000ULL, 0x600000000000ULL - kShadowOffset, MappingDesc::APP,
"app-2"},
- {0x600000000000ULL - kShadowOffset, 0x600000000000ULL + kShadowOffset,
MappingDesc::INVALID, "gap"},
- {0x600000000000ULL + kShadowOffset, 0x610000000000ULL,
MappingDesc::ORIGIN, "origin-1"},
+ {0x000000000000ULL, 0x010000000000ULL - kShadowOffset, MappingDesc::APP,
+ "app-1"},
+ {0x010000000000ULL - kShadowOffset, 0x010000000000ULL + kShadowOffset,
+ MappingDesc::INVALID, "gap"},
+ {0x010000000000ULL + kShadowOffset, 0x100000000000ULL + kShadowOffset,
+ MappingDesc::SHADOW, "shadow-2"},
+ {0x100000000000ULL + kShadowOffset, 0x110000000000ULL + kShadowOffset,
+ MappingDesc::INVALID, "invalid"},
+ {0x110000000000ULL + kShadowOffset, 0x200000000000ULL + kShadowOffset,
+ MappingDesc::ORIGIN, "origin-2"},
+ {0x200000000000ULL + kShadowOffset, 0x300000000000ULL + kShadowOffset,
+ MappingDesc::SHADOW, "shadow-3"},
+ {0x300000000000ULL + kShadowOffset, 0x400000000000ULL + kShadowOffset,
+ MappingDesc::ORIGIN, "origin-3"},
+ {0x400000000000ULL + kShadowOffset, 0x500000000000ULL + kShadowOffset,
+ MappingDesc::INVALID, "invalid"},
+ {0x500000000000ULL + kShadowOffset, 0x510000000000ULL, MappingDesc::SHADOW,
+ "shadow-1"},
+ {0x510000000000ULL, 0x600000000000ULL - kShadowOffset, MappingDesc::APP,
+ "app-2"},
+ {0x600000000000ULL - kShadowOffset, 0x600000000000ULL + kShadowOffset,
+ MappingDesc::INVALID, "gap"},
+ {0x600000000000ULL + kShadowOffset, 0x610000000000ULL, MappingDesc::ORIGIN,
+ "origin-1"},
{0x610000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"},
{0x700000000000ULL, 0x740000000000ULL, MappingDesc::ALLOCATOR,
"allocator"},
{0x740000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}};
-#define MEM_TO_SHADOW(mem) ((((uptr)(mem)) ^ 0x500000000000ULL) +
kShadowOffset)
-#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL)
+# define MEM_TO_SHADOW(mem) \
+ ((((uptr)(mem)) ^ 0x500000000000ULL) + kShadowOffset)
+# define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL)
#else
#error "Unsupported platform"
diff --git a/compiler-rt/lib/msan/msan_linux.cpp
b/compiler-rt/lib/msan/msan_linux.cpp
index ea9bddafc..dded97341 100644
--- a/compiler-rt/lib/msan/msan_linux.cpp
+++ b/compiler-rt/lib/msan/msan_linux.cpp
@@ -81,7 +81,7 @@ static bool ProtectMemoryRange(uptr beg, uptr size, const
char *name) {
return true;
}
-static const char * getMemoryLayoutMappingName(uptr addr) {
+static const char* getMemoryLayoutMappingName(uptr addr) {
for (unsigned i = 0; i < kMemoryLayoutSize; ++i)
if (addr >= kMemoryLayout[i].start && addr < kMemoryLayout[i].end)
return kMemoryLayout[i].name;
@@ -101,20 +101,26 @@ static void CheckMemoryLayoutSanity() {
CHECK(addr_is_type(end - 1, type));
if (type == MappingDesc::APP || type == MappingDesc::ALLOCATOR) {
uptr addr = start;
-#define CHECK_SHADOW(a) \
- if (!MEM_IS_SHADOW(MEM_TO_SHADOW(a))) {
\
- Printf("FATAL: MemorySanitizer:
MEM_IS_SHADOW(MEM_TO_SHADOW(%s:%p)):\n", kMemoryLayout[i].name, (void *)a); \
- Printf("- MEM_TO_SHADOW(%p) -> %p\n", (void *)a, (void
*)MEM_TO_SHADOW(a)); \
- Printf("- MappingDesc -> %s\n",
getMemoryLayoutMappingName(MEM_TO_SHADOW(a))); \
- Die();
\
- }
-#define CHECK_ORIGIN(a) \
- if (!MEM_IS_ORIGIN(MEM_TO_ORIGIN(a))) { \
- Printf("FATAL: MemorySanitizer:
MEM_IS_ORIGIN(MEM_TO_ORIGIN(%s:%p))\n", kMemoryLayout[i].name, (void *)a); \
- Printf("- MEM_TO_ORIGIN(%p) -> %p\n", (void *)a, (void
*)MEM_TO_ORIGIN(a)); \
- Printf("- MappingDesc -> %s\n",
getMemoryLayoutMappingName(MEM_TO_ORIGIN(a))); \
- Die();
\
- }
+# define CHECK_SHADOW(a)
\
+ if (!MEM_IS_SHADOW(MEM_TO_SHADOW(a))) {
\
+ Printf("FATAL: MemorySanitizer: MEM_IS_SHADOW(MEM_TO_SHADOW(%s:%p)):\n",
\
+ kMemoryLayout[i].name, (void*)a);
\
+ Printf("- MEM_TO_SHADOW(%p) -> %p\n", (void*)a,
\
+ (void*)MEM_TO_SHADOW(a));
\
+ Printf("- MappingDesc -> %s\n",
\
+ getMemoryLayoutMappingName(MEM_TO_SHADOW(a)));
\
+ Die();
\
+ }
+# define CHECK_ORIGIN(a) \
+ if (!MEM_IS_ORIGIN(MEM_TO_ORIGIN(a))) { \
+ Printf("FATAL: MemorySanitizer: MEM_IS_ORIGIN(MEM_TO_ORIGIN(%s:%p))\n", \
+ kMemoryLayout[i].name, (void*)a); \
+ Printf("- MEM_TO_ORIGIN(%p) -> %p\n", (void*)a, \
+ (void*)MEM_TO_ORIGIN(a)); \
+ Printf("- MappingDesc -> %s\n", \
+ getMemoryLayoutMappingName(MEM_TO_ORIGIN(a))); \
+ Die(); \
+ }
CHECK_SHADOW(addr);
CHECK_ORIGIN(addr);
``````````
</details>
https://github.com/llvm/llvm-project/pull/171993
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
