PyExpatModuleBuiltins: use putUncachedWithJavaEq during initialization

Author: steve-s

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

@@ -42,7 +42,6 @@
 
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 
 import com.oracle.graal.python.builtins.Builtin;
@@ -51,14 +50,18 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.PythonOS;
+import com.oracle.graal.python.builtins.objects.common.EconomicMapStorage;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.strings.TruffleString;
+import com.oracle.truffle.api.strings.TruffleString.HashCodeNode;
 
 @CoreFunctions(defineModule = "pyexpat", os = PythonOS.PLATFORM_WIN32)
 public final class PyExpatModuleBuiltins extends PythonBuiltins {
@@ -142,15 +145,17 @@ public void initialize(Python3Core core) {
         addBuiltinConstant("model", model);
 
         PythonModule errors = core.factory().createPythonModule(toTruffleStringUncached("pyexpat.errors"));
-        LinkedHashMap<String, Object> codes = new LinkedHashMap<>(ErrorConstant.values().length);
-        LinkedHashMap<Object, Object> messages = new LinkedHashMap<>(ErrorConstant.values().length);
+        EconomicMapStorage codes = EconomicMapStorage.create(ErrorConstant.values().length);
+        EconomicMapStorage messages = EconomicMapStorage.create(ErrorConstant.values().length);
         for (ErrorConstant c : ErrorConstant.values()) {
-            errors.setAttribute(toTruffleStringUncached(c.name()), toTruffleStringUncached(c.message));
-            codes.put(c.message, c.ordinal() + 1);
-            messages.put(c.ordinal() + 1, c.message);
+            TruffleString messageTs = toTruffleStringUncached(c.message);
+            errors.setAttribute(toTruffleStringUncached(c.name()), messageTs);
+            int id = c.ordinal() + 1;
+            codes.putUncachedWithJavaEq(messageTs, PyObjectHashNode.hash(messageTs, HashCodeNode.getUncached()), id);
+            messages.putUncachedWithJavaEq(id, PyObjectHashNode.hash(id), c.message);
         }
-        errors.setAttribute(toTruffleStringUncached("messages"), core.factory().createDictFromMapGeneric(messages));
-        errors.setAttribute(toTruffleStringUncached("codes"), core.factory().createDictFromMap(codes));
+        errors.setAttribute(toTruffleStringUncached("messages"), core.factory().createDict(messages));
+        errors.setAttribute(toTruffleStringUncached("codes"), core.factory().createDict(codes));
         addBuiltinConstant("errors", errors);
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/ObjectHashMap.java

@@ -353,7 +353,8 @@ public static Object doGetWithRestart(Frame frame, Node inliningTarget, ObjectHa
                         @Cached InlinedCountingConditionProfile collisionFoundNoValue,
                         @Cached InlinedCountingConditionProfile collisionFoundEqKey,
                         @Cached PyObjectRichCompareBool.EqNode eqNode) {
-            // must not call generic __eq__ before this
+            // Must not call generic __eq__ before builtins are initialized
+            // If this assert fires: we'll need something like putUncachedWithJavaEq also for get
             assert map.size == 0 || SpecialMethodSlot.areBuiltinSlotsInitialized();
             while (true) {
                 try {
@@ -476,6 +477,8 @@ public static void doPutWithRestart(Frame frame, Node inliningTarget, ObjectHash
                         @Cached InlinedBranchProfile rehash1Profile,
                         @Cached InlinedBranchProfile rehash2Profile,
                         @Cached PyObjectRichCompareBool.EqNode eqNode) {
+            // Must not call generic __eq__ before builtins are initialized
+            // If this assert fires: make sure to use putUncachedWithJavaEq during initialization
             assert map.size == 0 || (SpecialMethodSlot.areBuiltinSlotsInitialized() || eqNode == null);
             while (true) {
                 try {