You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/10/16 23:13:02 UTC
svn commit: r464670 - in
/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src: jit/ini.cpp
kernel_classes/native/java_lang_reflect_VMReflection.cpp
Author: geirm
Date: Mon Oct 16 14:13:01 2006
New Revision: 464670
URL: http://svn.apache.org/viewvc?view=rev&rev=464670
Log:
HARMONY-1668
tests.api.java.lang.reflect.InvocationTargetExceptionTest fails on interpreter
Ubuntu 6 - suggested testcase, smoke, c-unit and ~kernel passes
Modified:
incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/ini.cpp
incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/ini.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/ini.cpp?view=diff&rev=464670&r1=464669&r2=464670
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/ini.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/ini.cpp Mon Oct 16 14:13:01 2006
@@ -25,6 +25,7 @@
#include <assert.h>
#include "ini.h"
#include "environment.h"
+#include "exceptions.h"
#include "open/em_vm.h"
#include "jvmti_break_intf.h"
@@ -33,6 +34,7 @@
vm_execute_java_method_array(jmethodID method, jvalue *result, jvalue *args) {
// TODO: select jit which compiled the method
assert(!hythread_is_suspend_enabled());
+ assert(!exn_raised());
//FIXME integration
//DEBUG_PUSH_LOCK(JAVA_CODE_PSEUDO_LOCK);
assert(NULL != VM_Global_State::loader_env);
Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp?view=diff&rev=464670&r1=464669&r2=464670
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_reflect_VMReflection.cpp Mon Oct 16 14:13:01 2006
@@ -190,7 +190,7 @@
ABORT("Unexpected java type");
}
- return wrap_primitive(jenv, result, (char)return_type);
+ return exn_raised() ? NULL : wrap_primitive(jenv, result, (char)return_type);
}
JNIEXPORT jobject JNICALL Java_java_lang_reflect_VMReflection_invokeMethod