diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-10 11:02:11 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-10 12:26:02 -0700 |
| commit | 647b1a86f518d8db0331b3d52a96392b7a62504b (patch) | |
| tree | 7370f795ef3c7fbdd2695d23bc6f8171f40f43f1 /runtime/runtime.h | |
| parent | acfbbd4df2fc1c79a7102587bebf398f95b5e5de (diff) | |
| download | android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.tar.gz android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.tar.bz2 android_art-647b1a86f518d8db0331b3d52a96392b7a62504b.zip | |
Fix 2 new sets of clang compiler warnings.
Fix issues that are flagged by -Wfloat-equal and -Wmissing-noreturn.
In the case of -Wfloat-equal the current cases in regular code are deliberate,
so the change is to silence the warning. For gtest code the appropriate fix is
to switch from EXPECT_EQ to EXPECT_(FLOAT|DOUBLE)_EQ.
The -Wmissing-noreturn warning isn't enabled due to a missing noreturn in
gtest. This issue has been reported to gtest.
Change-Id: Id84c70c21c542716c9ee0c41492e8ff8788c4ef8
Diffstat (limited to 'runtime/runtime.h')
| -rw-r--r-- | runtime/runtime.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h index 1a6c6e0c54..30dabe7af4 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -180,7 +180,7 @@ class Runtime { // This isn't marked ((noreturn)) because then gcc will merge multiple calls // in a single function together. This reduces code size slightly, but means // that the native stack trace we get may point at the wrong call site. - static void Abort() LOCKS_EXCLUDED(Locks::abort_lock_); + static void Abort() NO_RETURN LOCKS_EXCLUDED(Locks::abort_lock_); // Returns the "main" ThreadGroup, used when attaching user threads. jobject GetMainThreadGroup() const; |