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/interpreter/interpreter_goto_table_impl.cc | |
| 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/interpreter/interpreter_goto_table_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index db7c452819..88d6544e80 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -662,6 +662,11 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } HANDLE_INSTRUCTION_END(); +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wfloat-equal" +#endif + HANDLE_INSTRUCTION_START(CMPL_FLOAT) { float val1 = shadow_frame.GetVRegFloat(inst->VRegB_23x()); float val2 = shadow_frame.GetVRegFloat(inst->VRegC_23x()); @@ -726,6 +731,10 @@ JValue ExecuteGotoImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem* } HANDLE_INSTRUCTION_END(); +#if defined(__clang__) +#pragma clang diagnostic pop +#endif + HANDLE_INSTRUCTION_START(CMP_LONG) { int64_t val1 = shadow_frame.GetVRegLong(inst->VRegB_23x()); int64_t val2 = shadow_frame.GetVRegLong(inst->VRegC_23x()); |