Fix DynamicObject.define() deprecations

Author: eregon

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -23,6 +23,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.transcode.EConvFlags;
 import org.truffleruby.Layouts;
@@ -515,8 +516,8 @@ public CoreLibrary(RubyContext context) {
         symbolClass = defineClass("Symbol");
 
         threadClass = defineClass("Thread");
-        threadClass.define("@report_on_exception", true);
-        threadClass.define("@abort_on_exception", false);
+        DynamicObjectLibrary.getUncached().put(threadClass, "@report_on_exception", true);
+        DynamicObjectLibrary.getUncached().put(threadClass, "@abort_on_exception", false);
         threadFactory = Layouts.THREAD.createThreadShape(threadClass, threadClass);
         Layouts.CLASS.setInstanceFactoryUnsafe(threadClass, threadFactory);
 

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -39,6 +39,7 @@
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.source.SourceSection;
 
 public class CoreExceptions {
@@ -853,7 +854,8 @@ public DynamicObject loadError(String message, String path, Node currentNode) {
             // This is a workaround for the rubygems/security.rb file expecting the error path to be openssl
             path = "openssl";
         }
-        loadError.define(
+        DynamicObjectLibrary.getUncached().put(
+                loadError,
                 "@path",
                 StringOperations.createString(context, StringOperations.encodeRope(path, UTF8Encoding.INSTANCE)));
         return loadError;
@@ -1142,7 +1144,7 @@ public DynamicObject systemExit(int exitStatus, Node currentNode) {
         DynamicObject exceptionClass = context.getCoreLibrary().systemExitClass;
         final DynamicObject systemExit = ExceptionOperations
                 .createRubyException(context, exceptionClass, message, currentNode, null);
-        systemExit.define("@status", exitStatus);
+        DynamicObjectLibrary.getUncached().put(systemExit, "@status", exitStatus);
         return systemExit;
     }
 

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -142,6 +142,7 @@
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -496,7 +497,11 @@ private void copyInstanceVariables(DynamicObject from, DynamicObject to) {
             // Concurrency: OK if callers create the object and publish it after copy
             // Only copy user-level instance variables, hidden ones are initialized later with #initialize_copy.
             for (Property property : getCopiedProperties(from.getShape())) {
-                to.define(property.getKey(), property.get(from, from.getShape()), property.getFlags());
+                DynamicObjectLibrary.getUncached().putWithFlags(
+                        to,
+                        property.getKey(),
+                        property.get(from, from.getShape()),
+                        property.getFlags());
             }
         }
 

src/main/java/org/truffleruby/language/objects/ObjectIDOperations.java

@@ -18,6 +18,7 @@
 import java.math.BigInteger;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.cext.ValueWrapperManager;
@@ -135,10 +136,10 @@ public static long verySlowGetObjectID(RubyContext context, DynamicObject object
         if (SharedObjects.isShared(context, object)) {
             synchronized (object) {
                 // no need for a write barrier here, objectID is a long.
-                object.define(Layouts.OBJECT_ID_IDENTIFIER, objectID);
+                DynamicObjectLibrary.getUncached().put(object, Layouts.OBJECT_ID_IDENTIFIER, objectID);
             }
         } else {
-            object.define(Layouts.OBJECT_ID_IDENTIFIER, objectID);
+            DynamicObjectLibrary.getUncached().put(object, Layouts.OBJECT_ID_IDENTIFIER, objectID);
         }
 
         return objectID;

src/main/java/org/truffleruby/language/objects/ObjectIVarSetNode.java

@@ -9,6 +9,7 @@
  */
 package org.truffleruby.language.objects;
 
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseNode;
@@ -54,10 +55,10 @@ protected Object ivarSetUncached(DynamicObject object, Object name, Object value
         if (SharedObjects.isShared(context, object)) {
             SharedObjects.writeBarrier(context, value);
             synchronized (object) {
-                object.define(checkName(context, object, name, checkName), value);
+                DynamicObjectLibrary.getUncached().put(object, checkName(context, object, name, checkName), value);
             }
         } else {
-            object.define(checkName(context, object, name, checkName), value);
+            DynamicObjectLibrary.getUncached().put(object, checkName(context, object, name, checkName), value);
         }
         return value;
     }

src/main/java/org/truffleruby/language/objects/WriteObjectFieldNode.java

@@ -9,6 +9,7 @@
  */
 package org.truffleruby.language.objects;
 
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.extra.ffi.Pointer;
@@ -162,7 +163,7 @@ protected void writeUncached(DynamicObject object, Object name, Object value, bo
                 newShape.getProperty(name).setSafe(object, value, shape, newShape);
             }
         } else {
-            object.define(name, value);
+            DynamicObjectLibrary.getUncached().put(object, name, value);
         }
     }