[GR-47778] Truffle attach rewritten to C 11.

PullRequest: graal/15180

Author: tzezula

truffle/mx.truffle/suite.py

@@ -1118,18 +1118,18 @@
       "os_arch" : {
         "windows" : {
           "<others>" : {
-            "cflags" : ["--std=c++11"]
+            "cflags" : []
           }
         },
         "linux" : {
           "<others>" : {
-            "cflags" : ["--std=c++11", "-g", "-Wall", "-Werror", "-D_GNU_SOURCE"],
+            "cflags" : ["-g", "-Wall", "-Werror", "-D_GNU_SOURCE"],
             "ldlibs" : ["-ldl"],
           },
         },
         "<others>" : {
           "<others>" : {
-            "cflags" : ["--std=c++11", "-g", "-Wall", "-Werror"],
+            "cflags" : ["-g", "-Wall", "-Werror"],
             "ldlibs" : ["-ldl"],
           },
         },

truffle/src/com.oracle.truffle.runtime.attach/src/truffle_attach.cc renamed to truffle/src/com.oracle.truffle.runtime.attach/src/truffle_attach.c

@@ -23,36 +23,24 @@
  * questions.
  */
 
-#include<jni.h>
+#include <jni.h>
 
-#define EXCEPTION_CHECK_VOID(env) if (env->ExceptionCheck()) { \
-return;                                                        \
-}
+#define EXCEPTION_CHECK_VOID(env)                                                                                                                    \
+    if ((*env)->ExceptionCheck(env)) {                                                                                                               \
+        return;                                                                                                                                      \
+    }
+
+// Library entry points
 
-static void addExports(JNIEnv* jniEnv, jobject m1, jobject pn, jobject m2)  {
-    jclass modulesClass = jniEnv->FindClass("jdk/internal/module/Modules");
+JNIEXPORT void JNICALL Java_com_oracle_truffle_runtime_ModulesSupport_addExports0(JNIEnv *jniEnv, jclass clz, jobject m1, jobject pn, jobject m2) {
+    jclass modulesClass = (*jniEnv)->FindClass(jniEnv, "jdk/internal/module/Modules");
     EXCEPTION_CHECK_VOID(jniEnv)
-    jmethodID addExports = jniEnv->GetStaticMethodID(modulesClass, "addExports", "(Ljava/lang/Module;Ljava/lang/String;Ljava/lang/Module;)V");
+    jmethodID addExports =
+        (*jniEnv)->GetStaticMethodID(jniEnv, modulesClass, "addExports", "(Ljava/lang/Module;Ljava/lang/String;Ljava/lang/Module;)V");
     EXCEPTION_CHECK_VOID(jniEnv)
-    jvalue args[4] {};
+    jvalue args[3];
     args[0].l = m1;
     args[1].l = pn;
     args[2].l = m2;
-    jniEnv->CallStaticVoidMethodA(modulesClass, addExports, args);
-}
-
-// Library entry points
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JNIEXPORT void JNICALL Java_com_oracle_truffle_runtime_ModulesSupport_addExports0(JNIEnv *env, jclass clz, jobject m1, jobject pn, jobject m2) {
-    addExports(env, m1, pn, m2);
-}
-
-
-#ifdef __cplusplus
+    (*jniEnv)->CallStaticVoidMethodA(jniEnv, modulesClass, addExports, args);
 }
-#endif
-