_struct: conditionally load optimised the pack and unpack functions if defined

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.nodes.BuiltinNames.__GRAALPYTHON__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ImportError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
@@ -64,7 +65,6 @@
 import com.oracle.graal.python.builtins.objects.method.PMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
-import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.argument.ReadIndexedArgumentNode;
 import com.oracle.graal.python.nodes.argument.ReadVarArgsNode;
 import com.oracle.graal.python.nodes.call.PythonCallNode;
@@ -105,7 +105,7 @@
 import com.oracle.truffle.api.nodes.NodeVisitor;
 import com.oracle.truffle.llvm.api.Toolchain;
 
-@CoreFunctions(defineModule = BuiltinNames.__GRAALPYTHON__)
+@CoreFunctions(defineModule = __GRAALPYTHON__)
 public class GraalPythonModuleBuiltins extends PythonBuiltins {
     public static final String LLVM_LANGUAGE = "llvm";
 
@@ -126,7 +126,7 @@ public void initialize(PythonCore core) {
     public void postInitialize(PythonCore core) {
         super.postInitialize(core);
         PythonContext context = core.getContext();
-        PythonModule mod = core.lookupBuiltinModule("__graalpython__");
+        PythonModule mod = core.lookupBuiltinModule(__GRAALPYTHON__);
         if (!ImageInfo.inImageBuildtimeCode()) {
             mod.setAttribute("home", context.getLanguage().getHome());
         }

graalpython/lib-graalpython/_struct.py

@@ -38,6 +38,26 @@
 # SOFTWARE.
 
 
+if "_truffle_pack" in globals():
+    @__graalpython__.builtin
+    def pack(fmt, *values):
+        try:
+            return _truffle_pack(fmt, *values)
+        except:
+            import _cpython_struct
+            return _cpython_struct.pack(fmt, *values)
+
+
+if "_truffle_unpack" in globals():
+    @__graalpython__.builtin
+    def unpack(fmt, buffer):
+        try:
+            return _truffle_unpack(fmt, buffer)
+        except:
+            import _cpython_struct
+            return _cpython_struct.unpack(fmt, buffer)
+
+
 __graalpython__.import_current_as_named_module_with_delegate(
     module_name="_struct",
     delegate_name="_cpython_struct",