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 /compiler/jni | |
| 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 'compiler/jni')
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index a21004c220..fd7d350a09 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -365,12 +365,12 @@ void JniCompilerTest::CompileAndRunDoubleDoubleMethodImpl() { EXPECT_EQ(0, gJava_MyClassNatives_fooDD_calls); jdouble result = env_->CallNonvirtualDoubleMethod(jobj_, jklass_, jmethod_, 99.0, 10.0); - EXPECT_EQ(99.0 - 10.0, result); + EXPECT_DOUBLE_EQ(99.0 - 10.0, result); EXPECT_EQ(1, gJava_MyClassNatives_fooDD_calls); jdouble a = 3.14159265358979323846; jdouble b = 0.69314718055994530942; result = env_->CallNonvirtualDoubleMethod(jobj_, jklass_, jmethod_, a, b); - EXPECT_EQ(a - b, result); + EXPECT_DOUBLE_EQ(a - b, result); EXPECT_EQ(2, gJava_MyClassNatives_fooDD_calls); gJava_MyClassNatives_fooDD_calls = 0; @@ -513,13 +513,13 @@ void JniCompilerTest::CompileAndRunStaticDoubleDoubleMethodImpl() { EXPECT_EQ(0, gJava_MyClassNatives_fooSDD_calls); jdouble result = env_->CallStaticDoubleMethod(jklass_, jmethod_, 99.0, 10.0); - EXPECT_EQ(99.0 - 10.0, result); + EXPECT_DOUBLE_EQ(99.0 - 10.0, result); EXPECT_EQ(1, gJava_MyClassNatives_fooSDD_calls); jdouble a = 3.14159265358979323846; jdouble b = 0.69314718055994530942; result = env_->CallStaticDoubleMethod(jklass_, jmethod_, a, b); - EXPECT_EQ(a - b, result); - EXPECT_EQ(2, gJava_MyClassNatives_fooSDD_calls); + EXPECT_DOUBLE_EQ(a - b, result); + EXPECT_DOUBLE_EQ(2, gJava_MyClassNatives_fooSDD_calls); gJava_MyClassNatives_fooSDD_calls = 0; } @@ -539,7 +539,7 @@ void JniCompilerTest::RunStaticLogDoubleMethodImpl() { SetUpForTest(true, "logD", "(D)D", reinterpret_cast<void*>(&Java_MyClassNatives_logD)); jdouble result = env_->CallStaticDoubleMethod(jklass_, jmethod_, 2.0); - EXPECT_EQ(log(2.0), result); + EXPECT_DOUBLE_EQ(log(2.0), result); } JNI_TEST(RunStaticLogDoubleMethod) @@ -553,7 +553,7 @@ void JniCompilerTest::RunStaticLogFloatMethodImpl() { SetUpForTest(true, "logF", "(F)F", reinterpret_cast<void*>(&Java_MyClassNatives_logF)); jfloat result = env_->CallStaticFloatMethod(jklass_, jmethod_, 2.0); - EXPECT_EQ(logf(2.0), result); + EXPECT_FLOAT_EQ(logf(2.0), result); } JNI_TEST(RunStaticLogFloatMethod) @@ -1047,11 +1047,11 @@ void JniCompilerTest::CompileAndRunFloatFloatMethodImpl() { jfloat result = env_->CallNonvirtualFloatMethod(jobj_, jklass_, jmethod_, 99.0F, 10.0F); - EXPECT_EQ(99.0F - 10.0F, result); + EXPECT_FLOAT_EQ(99.0F - 10.0F, result); jfloat a = 3.14159F; jfloat b = 0.69314F; result = env_->CallNonvirtualFloatMethod(jobj_, jklass_, jmethod_, a, b); - EXPECT_EQ(a - b, result); + EXPECT_FLOAT_EQ(a - b, result); } JNI_TEST(CompileAndRunFloatFloatMethod) |