Whitespace/lint
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@162909 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc
index 924f292..8abba56 100644
--- a/lib/asan/asan_allocator.cc
+++ b/lib/asan/asan_allocator.cc
@@ -316,7 +316,6 @@
class MallocInfo {
public:
-
explicit MallocInfo(LinkerInitialized x) : mu_(x) { }
AsanChunk *AllocateChunks(u8 size_class, uptr n_chunks) {
diff --git a/lib/asan/asan_allocator.h b/lib/asan/asan_allocator.h
index 6b1604f..c5e1aab 100644
--- a/lib/asan/asan_allocator.h
+++ b/lib/asan/asan_allocator.h
@@ -108,6 +108,7 @@
// Return the bottom of the maped region.
uptr AddrIsInFakeStack(uptr addr);
bool StackSize() { return stack_size_; }
+
private:
static const uptr kMinStackFrameSizeLog = 9; // Min frame is 512B.
static const uptr kMaxStackFrameSizeLog = 16; // Max stack frame is 64K.
diff --git a/lib/asan/asan_thread.h b/lib/asan/asan_thread.h
index 47585a3..8abc1d1 100644
--- a/lib/asan/asan_thread.h
+++ b/lib/asan/asan_thread.h
@@ -91,7 +91,6 @@
AsanStats &stats() { return stats_; }
private:
-
void SetThreadStackTopAndBottom();
void ClearShadowForThreadStack();
AsanThreadSummary *summary_;
diff --git a/lib/asan/tests/asan_test_utils.h b/lib/asan/tests/asan_test_utils.h
index fb509cc..7de1be4 100644
--- a/lib/asan/tests/asan_test_utils.h
+++ b/lib/asan/tests/asan_test_utils.h
@@ -41,7 +41,7 @@
#endif
// Make the compiler think that something is going on there.
-extern "C" void break_optimization(void *);
+extern "C" void break_optimization(void *arg);
// This function returns its parameter but in such a way that compiler
// can not prove it.
diff --git a/lib/tsan/output_tests/simple_stack2.cc b/lib/tsan/output_tests/simple_stack2.cc
index 2efc939..5605415 100644
--- a/lib/tsan/output_tests/simple_stack2.cc
+++ b/lib/tsan/output_tests/simple_stack2.cc
@@ -9,16 +9,22 @@
}
void __attribute__((noinline)) bar1() {
- volatile int tmp = 42; int tmp2 = tmp; (void)tmp2;
+ volatile int tmp = 42;
+ int tmp2 = tmp;
+ (void)tmp2;
foo1();
}
void __attribute__((noinline)) foo2() {
- volatile int tmp = Global; int tmp2 = tmp; (void)tmp2;
+ volatile int tmp = Global;
+ int tmp2 = tmp;
+ (void)tmp2;
}
void __attribute__((noinline)) bar2() {
- volatile int tmp = 42; int tmp2 = tmp; (void)tmp2;
+ volatile int tmp = 42;
+ int tmp2 = tmp;
+ (void)tmp2;
foo2();
}
@@ -38,9 +44,9 @@
// CHECK: WARNING: ThreadSanitizer: data race
// CHECK-NEXT: Write of size 4 at {{.*}} by thread 1:
// CHECK-NEXT: #0 foo1{{.*}} {{.*}}simple_stack2.cc:8{{(:3)?}} ({{.*}})
-// CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack2.cc:13{{(:3)?}} ({{.*}})
-// CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack2.cc:27{{(:3)?}} ({{.*}})
+// CHECK-NEXT: #1 bar1{{.*}} {{.*}}simple_stack2.cc:15{{(:3)?}} ({{.*}})
+// CHECK-NEXT: #2 Thread1{{.*}} {{.*}}simple_stack2.cc:33{{(:3)?}} ({{.*}})
// CHECK: Previous read of size 4 at {{.*}} by main thread:
-// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:17{{(:28)?}} ({{.*}})
-// CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack2.cc:22{{(:3)?}} ({{.*}})
-// CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack2.cc:34{{(:3)?}} ({{.*}})
+// CHECK-NEXT: #0 foo2{{.*}} {{.*}}simple_stack2.cc:19{{(:28)?}} ({{.*}})
+// CHECK-NEXT: #1 bar2{{.*}} {{.*}}simple_stack2.cc:28{{(:3)?}} ({{.*}})
+// CHECK-NEXT: #2 main{{.*}} {{.*}}simple_stack2.cc:40{{(:3)?}} ({{.*}})
diff --git a/lib/tsan/output_tests/static_init2.cc b/lib/tsan/output_tests/static_init2.cc
index f6e9596..8d41061 100644
--- a/lib/tsan/output_tests/static_init2.cc
+++ b/lib/tsan/output_tests/static_init2.cc
@@ -4,7 +4,7 @@
struct Cache {
int x;
- Cache(int x)
+ explicit Cache(int x)
: x(x) {
}
};
diff --git a/lib/tsan/output_tests/static_init4.cc b/lib/tsan/output_tests/static_init4.cc
index cdacbce..175d464 100644
--- a/lib/tsan/output_tests/static_init4.cc
+++ b/lib/tsan/output_tests/static_init4.cc
@@ -5,7 +5,7 @@
struct Cache {
int x;
- Cache(int x)
+ explicit Cache(int x)
: x(x) {
}
};
diff --git a/lib/tsan/output_tests/static_init5.cc b/lib/tsan/output_tests/static_init5.cc
index 4b050c9..89c1137 100644
--- a/lib/tsan/output_tests/static_init5.cc
+++ b/lib/tsan/output_tests/static_init5.cc
@@ -5,7 +5,7 @@
struct Cache {
int x;
- Cache(int x)
+ explicit Cache(int x)
: x(x) {
}
};
diff --git a/lib/tsan/output_tests/virtual_inheritance_compile_bug.cc b/lib/tsan/output_tests/virtual_inheritance_compile_bug.cc
index fd2febe..6198e8a 100644
--- a/lib/tsan/output_tests/virtual_inheritance_compile_bug.cc
+++ b/lib/tsan/output_tests/virtual_inheritance_compile_bug.cc
@@ -1,10 +1,10 @@
// Regression test for http://code.google.com/p/thread-sanitizer/issues/detail?id=3.
// The C++ variant is much more compact that the LLVM IR equivalent.
#include <stdio.h>
-struct AAA { virtual long aaa () { return 0; } };
-struct BBB: virtual AAA { unsigned long bbb; };
+struct AAA { virtual long aaa () { return 0; } }; // NOLINT
+struct BBB: virtual AAA { unsigned long bbb; }; // NOLINT
struct CCC: virtual AAA { };
-struct DDD: CCC, BBB { DDD (); };
+struct DDD: CCC, BBB { DDD(); }; // NOLINT
DDD::DDD() { }
int main() {
DDD d;