Fix espresso names gate

Author: loicottet

espresso/mx.espresso/mx_espresso.py

@@ -129,7 +129,14 @@ def _espresso_gate_runner(args, tasks):
                             break
 
                 with open(generated_header, 'r') as generated_header_file:
-                    generated_header_lines = generated_header_file.readlines()
+                    generated_header_lines = []
+                    for line in generated_header_file.readlines():
+                        # Ignore definitions that are not needed for Espresso
+                        if not line.startswith("typedef") or "(*Espresso_" in line or "__graal" in line or "(*graal_" in line:
+                            generated_header_lines.append(line)
+                        else:
+                            newline = generated_header_lines.pop()  # Remove newline before ignored declaration
+                            assert newline == "\n"
 
                 errors = errors or mx.update_file(committed_header, ''.join(committed_header_copyright + generated_header_lines), showDiff=True)
 

espresso/src/com.oracle.truffle.espresso.mokapot/include/libespresso_dynamic.h

@@ -42,8 +42,6 @@ typedef int (*Espresso_CloseContext_fn_t)(graal_isolatethread_t* thread, struct
 
 typedef void (*Espresso_Exit_fn_t)(graal_isolatethread_t* thread, struct JavaVM_* javaVM);
 
-typedef void (*vmLocatorSymbol_fn_t)(graal_isolatethread_t* thread);
-
 #if defined(__cplusplus)
 }
 #endif