diff options
-rw-r--r-- | lib/StaticAnalyzer/Core/RegionStore.cpp | 2 | ||||
-rw-r--r-- | tools/c-index-test/c-index-test.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/StaticAnalyzer/Core/RegionStore.cpp b/lib/StaticAnalyzer/Core/RegionStore.cpp index 5c732a1efe..f0eac9dc2b 100644 --- a/lib/StaticAnalyzer/Core/RegionStore.cpp +++ b/lib/StaticAnalyzer/Core/RegionStore.cpp @@ -56,7 +56,7 @@ private: : 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 f9b5cdf96b..5df21ec2a8 100644 --- a/tools/c-index-test/c-index-test.c +++ b/tools/c-index-test/c-index-test.c @@ -3355,12 +3355,12 @@ void thread_runner(void *client_data_v) { } 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); |