diff options
author | Ian Rogers <irogers@google.com> | 2014-10-31 00:33:20 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-11-03 20:01:04 -0800 |
commit | 6a3c1fcb4ba42ad4d5d142c17a3712a6ddd3866f (patch) | |
tree | 9df58b57af13240a93a6da4eefcf03f70cce9ad9 /runtime/instrumentation.h | |
parent | c6e0955737e15f7c0c3575d4e13789b3411f4993 (diff) | |
download | art-6a3c1fcb4ba42ad4d5d142c17a3712a6ddd3866f.zip art-6a3c1fcb4ba42ad4d5d142c17a3712a6ddd3866f.tar.gz art-6a3c1fcb4ba42ad4d5d142c17a3712a6ddd3866f.tar.bz2 |
Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags.
Fix associated errors about unused paramenters and implict sign conversions.
For sign conversion this was largely in the area of enums, so add ostream
operators for the effected enums and fix tools/generate-operator-out.py.
Tidy arena allocation code and arena allocated data types, rather than fixing
new and delete operators.
Remove dead code.
Change-Id: I5b433e722d2f75baacfacae4d32aef4a828bfe1b
Diffstat (limited to 'runtime/instrumentation.h')
-rw-r--r-- | runtime/instrumentation.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 3017bf6..646c7ae 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -103,13 +103,13 @@ struct InstrumentationListener { class Instrumentation { public: enum InstrumentationEvent { - kMethodEntered = 1 << 0, - kMethodExited = 1 << 1, - kMethodUnwind = 1 << 2, - kDexPcMoved = 1 << 3, - kFieldRead = 1 << 4, - kFieldWritten = 1 << 5, - kExceptionCaught = 1 << 6, + kMethodEntered = 1, // 1 << 0 + kMethodExited = 2, // 1 << 1 + kMethodUnwind = 4, // 1 << 2 + kDexPcMoved = 8, // 1 << 3 + kFieldRead = 16, // 1 << 4, + kFieldWritten = 32, // 1 << 5 + kExceptionCaught = 64, // 1 << 6 }; Instrumentation(); @@ -464,6 +464,7 @@ class Instrumentation { DISALLOW_COPY_AND_ASSIGN(Instrumentation); }; +std::ostream& operator<<(std::ostream& os, const Instrumentation::InstrumentationEvent& rhs); // An element in the instrumentation side stack maintained in art::Thread. struct InstrumentationStackFrame { |