diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-12 20:23:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-12 20:23:39 +0000 |
| commit | 6fea0097be6aefb0a1faf9eaf24cfbadda0959a5 (patch) | |
| tree | ea33754d124d5e15b02e1a7c09c81d27fd625ba3 /compiler | |
| parent | 58565098b2298041ccc97371a3cc486df88d51b3 (diff) | |
| parent | 48ee356484225ef0d7cfa197b1699524b866c802 (diff) | |
| download | android_art-6fea0097be6aefb0a1faf9eaf24cfbadda0959a5.tar.gz android_art-6fea0097be6aefb0a1faf9eaf24cfbadda0959a5.tar.bz2 android_art-6fea0097be6aefb0a1faf9eaf24cfbadda0959a5.zip | |
Merge "ART: Ignore result for exception-case JNIEndWithReference"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/jni/jni_compiler_test.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 70bfb81c23..4186891a2a 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -164,6 +164,7 @@ class JniCompilerTest : public CommonCompilerTest { void CheckParameterAlignImpl(); void MaxParamNumberImpl(); void WithoutImplementationImpl(); + void WithoutImplementationRefReturnImpl(); void StackArgsIntsFirstImpl(); void StackArgsFloatsFirstImpl(); void StackArgsMixedImpl(); @@ -1494,6 +1495,20 @@ void JniCompilerTest::WithoutImplementationImpl() { JNI_TEST(WithoutImplementation) +void JniCompilerTest::WithoutImplementationRefReturnImpl() { + // This will lead to error messages in the log. + ScopedLogSeverity sls(LogSeverity::FATAL); + + SetUpForTest(false, "withoutImplementationRefReturn", "()Ljava/lang/Object;", nullptr); + + env_->CallObjectMethod(jobj_, jmethod_); + + EXPECT_TRUE(Thread::Current()->IsExceptionPending()); + EXPECT_TRUE(env_->ExceptionCheck() == JNI_TRUE); +} + +JNI_TEST(WithoutImplementationRefReturn) + void Java_MyClassNatives_stackArgsIntsFirst(JNIEnv*, jclass, jint i1, jint i2, jint i3, jint i4, jint i5, jint i6, jint i7, jint i8, jint i9, jint i10, jfloat f1, jfloat f2, jfloat f3, jfloat f4, |