From 3c898224ff9699be80f50a15d759f40acd43d5de Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Sat, 16 Sep 2017 14:23:00 -0400 Subject: [PATCH] Revert changes to native code for now This reverts commit a39da55d97b7c2888ad0b86d15cfb1754a35b1c7. --- com.ibm.wala.cast.java.test.data/src/Monitor2.java | 4 ---- com.ibm.wala.cast/source/c/include/Exceptions.h | 3 +-- com.ibm.wala.cast/source/c/include/launch.h | 4 ++-- com.ibm.wala.cast/source/c/jni/Exceptions.cpp | 9 ++------- com.ibm.wala.cast/source/c/jni/launch.cpp | 2 +- com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF | 3 +-- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/com.ibm.wala.cast.java.test.data/src/Monitor2.java b/com.ibm.wala.cast.java.test.data/src/Monitor2.java index 61ca9e373..ce0e70d00 100644 --- a/com.ibm.wala.cast.java.test.data/src/Monitor2.java +++ b/com.ibm.wala.cast.java.test.data/src/Monitor2.java @@ -9,10 +9,6 @@ * IBM Corporation - initial API and implementation *****************************************************************************/ public class Monitor2 { - private static boolean randomIsolate() { - return Math.random() > .5; - } - int i = 0; public Monitor2() { } diff --git a/com.ibm.wala.cast/source/c/include/Exceptions.h b/com.ibm.wala.cast/source/c/include/Exceptions.h index fe36c7282..d5a54d926 100644 --- a/com.ibm.wala.cast/source/c/include/Exceptions.h +++ b/com.ibm.wala.cast/source/c/include/Exceptions.h @@ -75,8 +75,7 @@ private: jclass _jre; jmethodID _ctr; jmethodID _wrapper_ctr; - jmethodID _message; - + public: Exceptions(JNIEnv *java_env, jmp_buf& c_env); diff --git a/com.ibm.wala.cast/source/c/include/launch.h b/com.ibm.wala.cast/source/c/include/launch.h index 17ae8b727..9ede70fd7 100644 --- a/com.ibm.wala.cast/source/c/include/launch.h +++ b/com.ibm.wala.cast/source/c/include/launch.h @@ -3,7 +3,7 @@ #include "jni.h" -extern "C" JNIEnv *launch(char *); -extern "C" void kill(); +extern JNIEnv *launch(char *); +extern void kill(); #endif diff --git a/com.ibm.wala.cast/source/c/jni/Exceptions.cpp b/com.ibm.wala.cast/source/c/jni/Exceptions.cpp index 4c9dc4afe..1f67e660b 100644 --- a/com.ibm.wala.cast/source/c/jni/Exceptions.cpp +++ b/com.ibm.wala.cast/source/c/jni/Exceptions.cpp @@ -13,7 +13,6 @@ Exceptions::Exceptions(JNIEnv *java_env, jmp_buf& c_env) : { _jre = java_env->FindClass("java/lang/RuntimeException"); _ctr = java_env->GetMethodID(_jre, "", "(Ljava/lang/String;)V"); - _message = java_env->GetMethodID(_jre, "getMessage", "()Ljava/lang/String;"); _wrapper_ctr = java_env->GetMethodID(_jre, "", @@ -28,13 +27,9 @@ void Exceptions::throwException(const char *file_name, int line_number) { jthrowable real_ex = _java_env->ExceptionOccurred(); _java_env->ExceptionClear(); - jstring message = (jstring) - _java_env->CallObjectMethod(real_ex, _message); - const char *m = _java_env->GetStringUTFChars(message, false); - - char msg[strlen(file_name) + strlen(m) + 1024]; + char msg[strlen(file_name) + 1024]; memset(msg, 0, strlen(file_name) + 1024); - sprintf(msg, "exception at %s:%d: %s", file_name, line_number, m); + sprintf(msg, "exception at %s:%d", file_name, line_number); jstring java_message = _java_env->NewStringUTF(msg); jthrowable ex = (jthrowable) diff --git a/com.ibm.wala.cast/source/c/jni/launch.cpp b/com.ibm.wala.cast/source/c/jni/launch.cpp index e4b648e7b..df28cf383 100644 --- a/com.ibm.wala.cast/source/c/jni/launch.cpp +++ b/com.ibm.wala.cast/source/c/jni/launch.cpp @@ -3,9 +3,9 @@ #include #include "Exceptions.h" #include "CAstWrapper.h" -#include "launch.h" JavaVM *javaVM; + JNIEnv *launch(char *classpath) { JavaVMOption jvmopt[2]; diff --git a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF index 202f89646..51c366ed7 100644 --- a/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF @@ -26,8 +26,7 @@ Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0", org.eclipse.ui.ide, org.eclipse.ui.ide.application, org.eclipse.ant.launching, - com.ibm.wala.cast.java.ecj, - com.ibm.wala.shrike + com.ibm.wala.cast.java.ecj Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.ibm.wala.cast.java.jdt.test,