Fix an incorrect && with kTraceCountAllocs flag.
The latest Clang warns on this particular use of a constant flag with
logical operators. It looks like this:
error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand]
Test: Build art
Change-Id: If1635e8f02ac6ef438dbef201053973e5012b04c
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 1986eec..50a179c 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -420,7 +420,7 @@
if (the_trace_ != nullptr) {
LOG(ERROR) << "Trace already in progress, ignoring this request";
} else {
- enable_stats = (flags && kTraceCountAllocs) != 0;
+ enable_stats = (flags & kTraceCountAllocs) != 0;
the_trace_ = new Trace(trace_file.release(), buffer_size, flags, output_mode, trace_mode);
if (trace_mode == TraceMode::kSampling) {
CHECK_PTHREAD_CALL(pthread_create, (&sampling_pthread_, nullptr, &RunSamplingThread,
@@ -608,7 +608,7 @@
Runtime* runtime = Runtime::Current();
// Enable count of allocs if specified in the flags.
- bool enable_stats = (the_trace->flags_ && kTraceCountAllocs) != 0;
+ bool enable_stats = (the_trace->flags_ & kTraceCountAllocs) != 0;
{
gc::ScopedGCCriticalSection gcs(self,