Fix a couple of pedantic gcc warnings.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161656 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/StaticAnalyzer/Core/RegionStore.cpp b/lib/StaticAnalyzer/Core/RegionStore.cpp
index 5c732a1..f0eac9d 100644
--- a/lib/StaticAnalyzer/Core/RegionStore.cpp
+++ b/lib/StaticAnalyzer/Core/RegionStore.cpp
@@ -56,7 +56,7 @@
: P(r, k), Data(offset) {
assert(r && "Must have known regions.");
assert(getOffset() == offset && "Failed to store offset");
- assert(r == r->getBaseRegion() || isa<ObjCIvarRegion>(r) && "Not a base");
+ assert((r == r->getBaseRegion() || isa<ObjCIvarRegion>(r)) && "Not a base");
}
public:
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index f9b5cdf..5df21ec 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -3355,12 +3355,12 @@
}
int main(int argc, const char **argv) {
+ thread_info client_data;
+
#ifdef CLANG_HAVE_LIBXML
LIBXML_TEST_VERSION
#endif
- thread_info client_data;
-
if (getenv("CINDEXTEST_NOTHREADS"))
return cindextest_main(argc, argv);
