diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 12:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 19:16:01 -0800 |
| commit | 719d1a33f6569864f529e5a3fff59e7bca97aad0 (patch) | |
| tree | fcd84efd7b9806b93ec1a44e2317e6f882e7fe0e /runtime/verify_object.h | |
| parent | 5365eea9940269b662cfbe103caa348816ff1558 (diff) | |
| download | art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.gz art-719d1a33f6569864f529e5a3fff59e7bca97aad0.tar.bz2 art-719d1a33f6569864f529e5a3fff59e7bca97aad0.zip | |
Enable annotalysis on clang ART builds.
Fix clang build errors aswell as restructure locking/mutex code for correct
thread safety analysis support.
Reorder make dependencies so that host builds build first as they should
provide better compilation errors than target.
Remove host's use of -fno-omit-frame-pointer as it has no value with correct
use of CFI, which we should have.
Change-Id: I72cea8da9a3757b1a0b3acb4081feccb7c6cef90
Diffstat (limited to 'runtime/verify_object.h')
| -rw-r--r-- | runtime/verify_object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/verify_object.h b/runtime/verify_object.h index b39df4a374..6640e0dd4a 100644 --- a/runtime/verify_object.h +++ b/runtime/verify_object.h @@ -17,10 +17,10 @@ #ifndef ART_RUNTIME_VERIFY_OBJECT_H_ #define ART_RUNTIME_VERIFY_OBJECT_H_ -#include "locks.h" - #include <stdint.h> +#include "base/macros.h" + namespace art { namespace mirror { @@ -52,10 +52,10 @@ static constexpr VerifyObjectFlags kDefaultVerifyFlags = kVerifyNone; static constexpr VerifyObjectMode kVerifyObjectSupport = kDefaultVerifyFlags != 0 ? kVerifyObjectModeFast : kVerifyObjectModeDisabled; -ALWAYS_INLINE inline void VerifyObject(mirror::Object* obj) NO_THREAD_SAFETY_ANALYSIS; +void VerifyObject(mirror::Object* obj) ALWAYS_INLINE NO_THREAD_SAFETY_ANALYSIS; // Check that c.getClass() == c.getClass().getClass(). -ALWAYS_INLINE inline bool VerifyClassClass(mirror::Class* c) NO_THREAD_SAFETY_ANALYSIS; +bool VerifyClassClass(mirror::Class* c) ALWAYS_INLINE NO_THREAD_SAFETY_ANALYSIS; } // namespace art |