diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index 5d00cd04b15e..6fdbd97584ec 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -138,7 +138,7 @@ void NORETURN CheckFailed(const char *file, int line, const char *cond,
 
 #define IMPL_PASTE(a, b) a##b
 #define IMPL_COMPILER_ASSERT(pred, line) \
-    typedef char IMPL_PASTE(assertion_failed_##_, line)[2*(int)(pred)-1];
+    typedef char IMPL_PASTE(assertion_failed_##_, line)[2*(int)(pred)-1]
 
 // Limits for integral types. We have to redefine it in case we don't
 // have stdint.h (like in Visual Studio 9).
diff --git a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index 42fb75878f52..6031afe3d1e7 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
@@ -51,8 +51,7 @@ ${CPPLINT} --filter=${ASAN_RTL_LINT_FILTER} ${INTERCEPTION}/*.{cc,h}
 # ASan
 ASAN_RTL=${COMPILER_RT}/lib/asan
 ${CPPLINT} --filter=${ASAN_RTL_LINT_FILTER} ${ASAN_RTL}/*.{cc,h}
-${CPPLINT} --filter=${ASAN_TEST_LINT_FILTER} ${ASAN_RTL}/tests/*.{cc,h} \
-                                             ${ASAN_RTL}/output_tests/*.cc
+${CPPLINT} --filter=${ASAN_TEST_LINT_FILTER} ${ASAN_RTL}/tests/*.{cc,h}
 ${CPPLINT} --filter=${ASAN_TEST_LINT_FILTER} ${ASAN_RTL}/lit_tests/*.cc \
                                              ${ASAN_RTL}/lit_tests/*/*.cc \
 
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc
index c210620c8da1..5ac50eb1145f 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc
@@ -24,7 +24,7 @@ TEST(SanitizerCommon, StackDepotBasic) {
   const uptr *sp1 = StackDepotGet(i1, &sz1);
   EXPECT_NE(sp1, (uptr*)0);
   EXPECT_EQ(sz1, ARRAY_SIZE(s1));
-  EXPECT_EQ(internal_memcmp(sp1?:s1, s1, sizeof(s1)), 0);
+  EXPECT_EQ(internal_memcmp(sp1, s1, sizeof(s1)), 0);
 }
 
 TEST(SanitizerCommon, StackDepotAbsent) {
@@ -55,7 +55,7 @@ TEST(SanitizerCommon, StackDepotSame) {
   const uptr *sp1 = StackDepotGet(i1, &sz1);
   EXPECT_NE(sp1, (uptr*)0);
   EXPECT_EQ(sz1, ARRAY_SIZE(s1));
-  EXPECT_EQ(internal_memcmp(sp1?:s1, s1, sizeof(s1)), 0);
+  EXPECT_EQ(internal_memcmp(sp1, s1, sizeof(s1)), 0);
 }
 
 TEST(SanitizerCommon, StackDepotSeveral) {