Skip to content

Commit a604285

Browse files
otethalotethal
committed
Rename Read/Write attr nodes
1 parent a57d062 commit a604285

29 files changed

+101
-101
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
import java.util.ServiceLoader;
5757
import java.util.logging.Level;
5858

59+
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
60+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
5961
import org.graalvm.nativeimage.ImageInfo;
6062

6163
import com.oracle.graal.python.PythonLanguage;
@@ -356,8 +358,6 @@
356358
import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
357359
import com.oracle.graal.python.lib.PyObjectLookupAttr;
358360
import com.oracle.graal.python.nodes.BuiltinNames;
359-
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
360-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
361361
import com.oracle.graal.python.nodes.call.GenericInvokeNode;
362362
import com.oracle.graal.python.nodes.statement.AbstractImportNode;
363363
import com.oracle.graal.python.pegparser.FutureFeature;
@@ -899,8 +899,8 @@ private void initializeImportlib() {
899899
PythonModule bootstrapExternal;
900900

901901
PyObjectCallMethodObjArgs callNode = PyObjectCallMethodObjArgs.getUncached();
902-
WriteAttributeToDynamicObjectNode writeNode = WriteAttributeToDynamicObjectNode.getUncached();
903-
ReadAttributeFromDynamicObjectNode readNode = ReadAttributeFromDynamicObjectNode.getUncached();
902+
WriteAttributeToPythonObjectNode writeNode = WriteAttributeToPythonObjectNode.getUncached();
903+
ReadAttributeFromPythonObjectNode readNode = ReadAttributeFromPythonObjectNode.getUncached();
904904
PyDictSetItem setItem = PyDictSetItem.getUncached();
905905

906906
// first, a workaround since postInitialize hasn't run yet for the _weakref module aliases

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
import com.oracle.graal.python.nodes.PConstructAndRaiseNode;
100100
import com.oracle.graal.python.nodes.PGuards;
101101
import com.oracle.graal.python.nodes.PRaiseNode;
102-
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
102+
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
103103
import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
104-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
104+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
105105
import com.oracle.graal.python.nodes.call.GenericInvokeNode;
106106
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
107107
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -288,8 +288,8 @@ public abstract static class CreateDynamic extends PythonBinaryBuiltinNode {
288288
Object run(VirtualFrame frame, PythonObject moduleSpec, @SuppressWarnings("unused") Object filename,
289289
@Bind("this") Node inliningTarget,
290290
@Cached("createFor(this)") IndirectCallData indirectCallData,
291-
@Cached ReadAttributeFromDynamicObjectNode readNameNode,
292-
@Cached ReadAttributeFromDynamicObjectNode readOriginNode,
291+
@Cached ReadAttributeFromPythonObjectNode readNameNode,
292+
@Cached ReadAttributeFromPythonObjectNode readOriginNode,
293293
@Cached CastToTruffleStringNode castToTruffleStringNode,
294294
@Cached TruffleString.EqualNode eqNode,
295295
@Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode) {
@@ -690,14 +690,14 @@ public static PythonModule importFrozenModuleObject(Python3Core core, TruffleStr
690690

691691
if (info.isPackage) {
692692
/* Set __path__ to the empty list */
693-
WriteAttributeToDynamicObjectNode.getUncached().execute(module, T___PATH__, core.factory().createList());
693+
WriteAttributeToPythonObjectNode.getUncached().execute(module, T___PATH__, core.factory().createList());
694694
}
695695

696696
RootCallTarget callTarget = CodeNodes.GetCodeCallTargetNode.executeUncached(code);
697697
GenericInvokeNode.getUncached().execute(callTarget, PArguments.withGlobals(module));
698698

699699
Object origName = info.origName == null ? PNone.NONE : info.origName;
700-
WriteAttributeToDynamicObjectNode.getUncached().execute(module, T___ORIGNAME__, origName);
700+
WriteAttributeToPythonObjectNode.getUncached().execute(module, T___ORIGNAME__, origName);
701701

702702
return module;
703703
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
import com.oracle.graal.python.nodes.HiddenAttr;
8080
import com.oracle.graal.python.nodes.PNodeWithContext;
8181
import com.oracle.graal.python.nodes.PRaiseNode;
82-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
82+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
8383
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
8484
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
8585
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -1106,7 +1106,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
11061106
@Specialization
11071107
static Object getClockInfo(TruffleString name,
11081108
@Bind("this") Node inliningTarget,
1109-
@Cached WriteAttributeToDynamicObjectNode writeAttrNode,
1109+
@Cached WriteAttributeToPythonObjectNode writeAttrNode,
11101110
@Cached TruffleString.EqualNode equalNode,
11111111
@Cached PythonObjectFactory factory,
11121112
@Cached PRaiseNode.Lazy raiseNode) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/WarningsModuleBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
import com.oracle.graal.python.nodes.HiddenAttr;
108108
import com.oracle.graal.python.nodes.PRaiseNode;
109109
import com.oracle.graal.python.nodes.SpecialAttributeNames;
110-
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
110+
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
111111
import com.oracle.graal.python.nodes.call.CallNode;
112112
import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
113113
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -1200,7 +1200,7 @@ protected void execute(Frame frame, Object source, Object category, TruffleStrin
12001200
@TruffleBoundary
12011201
private void executeImpl(Object source, Object category, TruffleString format, int stackLevel, Object... formatArgs) {
12021202
PythonModule _warnings = PythonContext.get(this).lookupBuiltinModule(T__WARNINGS);
1203-
Object warn = ReadAttributeFromDynamicObjectNode.executeUncached(_warnings, T_WARN, PNone.NONE);
1203+
Object warn = ReadAttributeFromPythonObjectNode.executeUncached(_warnings, T_WARN, PNone.NONE);
12041204
TruffleString message;
12051205
try {
12061206
message = TruffleString.fromJavaStringUncached(ErrorMessageFormatter.format(format, formatArgs), TS_ENCODING);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextAbstractBuiltins.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
import com.oracle.graal.python.lib.PySliceNew;
119119
import com.oracle.graal.python.nodes.ErrorMessages;
120120
import com.oracle.graal.python.nodes.PRaiseNode;
121-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
121+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
122122
import com.oracle.graal.python.nodes.builtins.ListNodes.ConstructListNode;
123123
import com.oracle.graal.python.nodes.call.CallNode;
124124
import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
@@ -963,21 +963,21 @@ Object get(Object obj,
963963
abstract static class PyObject_SetDoc extends CApiBinaryBuiltinNode {
964964
@Specialization
965965
static int set(PBuiltinFunction obj, TruffleString value,
966-
@Shared("write") @Cached WriteAttributeToDynamicObjectNode write) {
966+
@Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
967967
write.execute(obj, T___DOC__, value);
968968
return 1;
969969
}
970970

971971
@Specialization
972972
static int set(PBuiltinMethod obj, TruffleString value,
973-
@Shared("write") @Cached WriteAttributeToDynamicObjectNode write) {
973+
@Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
974974
set(obj.getBuiltinFunction(), value, write);
975975
return 1;
976976
}
977977

978978
@Specialization
979979
static int set(GetSetDescriptor obj, TruffleString value,
980-
@Shared("write") @Cached WriteAttributeToDynamicObjectNode write) {
980+
@Shared("write") @Cached WriteAttributeToPythonObjectNode write) {
981981
write.execute(obj, T___DOC__, value);
982982
return 1;
983983
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
import com.oracle.graal.python.nodes.PRaiseNode;
168168
import com.oracle.graal.python.nodes.argument.keywords.ExpandKeywordStarargsNode;
169169
import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
170-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
171170
import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
171+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
172172
import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
173173
import com.oracle.graal.python.nodes.frame.GetCurrentFrameRef;
174174
import com.oracle.graal.python.nodes.object.GetClassNode;
@@ -1008,8 +1008,8 @@ static void doNativeClass(PythonNativeClass object, TruffleString key, Object va
10081008

10091009
@Specialization(guards = {"!isPythonBuiltinClass(object)"})
10101010
static void doObject(PythonObject object, TruffleString key, Object value,
1011-
@Exclusive @Cached(inline = false) WriteAttributeToDynamicObjectNode writeAttrToDynamicObjectNode) {
1012-
writeAttrToDynamicObjectNode.execute(object, key, value);
1011+
@Exclusive @Cached(inline = false) WriteAttributeToPythonObjectNode writeAttrToPythonObjectNode) {
1012+
writeAttrToPythonObjectNode.execute(object, key, value);
10131013
}
10141014
}
10151015

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextMethodBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
6060
import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
6161
import com.oracle.graal.python.nodes.HiddenAttr;
62-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
62+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
6363
import com.oracle.graal.python.runtime.object.PythonObjectFactory;
6464
import com.oracle.truffle.api.dsl.Bind;
6565
import com.oracle.truffle.api.dsl.Cached;
@@ -93,7 +93,7 @@ static Object doNativeCallable(Node inliningTarget, Object methodDefPtr, Truffle
9393
@Cached(inline = false) PythonObjectFactory factory,
9494
@Cached CreateFunctionNode createFunctionNode,
9595
@Cached HiddenAttr.WriteNode writeHiddenAttrNode,
96-
@Cached(inline = false) WriteAttributeToDynamicObjectNode writeAttrNode) {
96+
@Cached(inline = false) WriteAttributeToPythonObjectNode writeAttrNode) {
9797
Object f = createFunctionNode.execute(inliningTarget, name, methObj, wrapper, PNone.NO_VALUE, flags);
9898
assert f instanceof PBuiltinFunction;
9999
PBuiltinFunction func = (PBuiltinFunction) f;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextModuleBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import com.oracle.graal.python.lib.PyUnicodeCheckNode;
7272
import com.oracle.graal.python.nodes.ErrorMessages;
7373
import com.oracle.graal.python.nodes.PRaiseNode;
74-
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
74+
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
7575
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
7676
import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
7777
import com.oracle.graal.python.nodes.call.CallNode;
@@ -233,7 +233,7 @@ abstract static class PyTruffleModule_AddFunctionToModule extends CApi7BuiltinNo
233233
static Object moduleFunction(Object methodDefPtr, PythonModule mod, TruffleString name, Object cfunc, int flags, int wrapper, Object doc,
234234
@Bind("this") Node inliningTarget,
235235
@Cached ObjectBuiltins.SetattrNode setattrNode,
236-
@Cached ReadAttributeFromDynamicObjectNode readAttrNode,
236+
@Cached ReadAttributeFromPythonObjectNode readAttrNode,
237237
@Cached CFunctionNewExMethodNode cFunctionNewExMethodNode) {
238238
Object modName = readAttrNode.execute(mod, T___NAME__, null);
239239
assert modName != null : "module name is missing!";

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
import com.oracle.graal.python.nodes.HiddenAttr;
9595
import com.oracle.graal.python.nodes.SpecialAttributeNames;
9696
import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
97-
import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
97+
import com.oracle.graal.python.nodes.attributes.WriteAttributeToPythonObjectNode;
9898
import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
9999
import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
100100
import com.oracle.graal.python.runtime.PythonContext;
@@ -252,7 +252,7 @@ abstract static class NewClassMethodNode extends Node {
252252
static Object classOrStatic(Node inliningTarget, Object methodDefPtr, TruffleString name, Object methObj, int flags, int wrapper, Object type, Object doc,
253253
@Cached(inline = false) PythonObjectFactory factory,
254254
@Exclusive @Cached HiddenAttr.WriteNode writeHiddenAttrNode,
255-
@Cached(inline = false) WriteAttributeToDynamicObjectNode writeAttrNode,
255+
@Cached(inline = false) WriteAttributeToPythonObjectNode writeAttrNode,
256256
@Exclusive @Cached CreateFunctionNode createFunctionNode) {
257257
PythonAbstractObject func = createFunctionNode.execute(inliningTarget, name, methObj, wrapper, type, flags);
258258
writeHiddenAttrNode.execute(inliningTarget, func, METHOD_DEF_PTR, methodDefPtr);
@@ -305,7 +305,7 @@ abstract static class PyTruffleType_AddSlot extends CApi7BuiltinNode {
305305
static int addSlot(Object clazz, PDict tpDict, TruffleString memberName, Object cfunc, int flags, int wrapper, Object memberDoc) {
306306
// create wrapper descriptor
307307
PythonObject wrapperDescriptor = CreateFunctionNode.executeUncached(memberName, cfunc, wrapper, clazz, flags);
308-
WriteAttributeToDynamicObjectNode.getUncached().execute(wrapperDescriptor, SpecialAttributeNames.T___DOC__, memberDoc);
308+
WriteAttributeToPythonObjectNode.getUncached().execute(wrapperDescriptor, SpecialAttributeNames.T___DOC__, memberDoc);
309309

310310
// add wrapper descriptor to tp_dict
311311
PyDictSetDefault.executeUncached(tpDict, memberName, wrapperDescriptor);
@@ -330,7 +330,7 @@ public static int addMember(Object clazz, PDict tpDict, TruffleString memberName
330330

331331
// create member descriptor
332332
GetSetDescriptor memberDescriptor = PythonObjectFactory.getUncached().createMemberDescriptor(getterObject, setterObject, memberName, clazz);
333-
WriteAttributeToDynamicObjectNode.getUncached().execute(memberDescriptor, SpecialAttributeNames.T___DOC__, memberDoc);
333+
WriteAttributeToPythonObjectNode.getUncached().execute(memberDescriptor, SpecialAttributeNames.T___DOC__, memberDoc);
334334

335335
// add member descriptor to tp_dict
336336
PyDictSetDefault.executeUncached(tpDict, memberName, memberDescriptor);
@@ -368,7 +368,7 @@ static GetSetDescriptor createGetSet(Node inliningTarget, TruffleString name, Ob
368368

369369
// create get-set descriptor
370370
GetSetDescriptor descriptor = factory.createGetSetDescriptor(get, set, name, cls, hasSetter);
371-
WriteAttributeToDynamicObjectNode.executeUncached(descriptor, T___DOC__, doc);
371+
WriteAttributeToPythonObjectNode.executeUncached(descriptor, T___DOC__, doc);
372372
return descriptor;
373373
}
374374

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import com.oracle.graal.python.nodes.PRaiseNode;
7676
import com.oracle.graal.python.nodes.SpecialAttributeNames;
7777
import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
78-
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
78+
import com.oracle.graal.python.nodes.attributes.ReadAttributeFromPythonObjectNode;
7979
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
8080
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
8181
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -160,7 +160,7 @@ static Object reduce(VirtualFrame frame, CDataObject self,
160160
@Bind("this") Node inliningTarget,
161161
@Cached PyObjectStgDictNode pyObjectStgDictNode,
162162
@Cached("create(T___DICT__)") GetAttributeNode getAttributeNode,
163-
@Cached ReadAttributeFromDynamicObjectNode readAttrNode,
163+
@Cached ReadAttributeFromPythonObjectNode readAttrNode,
164164
@Cached PointerNodes.ReadBytesNode readBytesNode,
165165
@Cached GetClassNode getClassNode,
166166
@Cached PythonObjectFactory factory,

0 commit comments

Comments
 (0)