Skip to content

Commit eafc440

Browse files
otethalotethal
committed
Remove occurrences of HiddenKey
1 parent 9e0327a commit eafc440

File tree

10 files changed

+26
-38
lines changed

10 files changed

+26
-38
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
import com.oracle.graal.python.util.BiConsumer;
131131
import com.oracle.truffle.api.RootCallTarget;
132132
import com.oracle.truffle.api.dsl.NodeFactory;
133-
import com.oracle.truffle.api.object.HiddenKey;
134133
import com.oracle.truffle.api.strings.TruffleString;
135134

136135
public abstract class PythonBuiltins {
@@ -267,18 +266,14 @@ private static int numDefaults(Builtin builtin) {
267266
}
268267

269268
private void addBuiltinConstantInternal(Object name, Object value) {
270-
assert name instanceof TruffleString || name instanceof HiddenKey || name instanceof HiddenAttr;
269+
assert name instanceof TruffleString || name instanceof HiddenAttr;
271270
builtinConstants.put(name, ensureNoJavaString(value));
272271
}
273272

274273
protected final void addBuiltinConstant(HiddenAttr name, Object value) {
275274
addBuiltinConstantInternal(name, value);
276275
}
277276

278-
protected final void addBuiltinConstant(HiddenKey name, Object value) {
279-
addBuiltinConstantInternal(name, value);
280-
}
281-
282277
protected final void addBuiltinConstant(String name, Object value) {
283278
addBuiltinConstantInternal(toTruffleStringUncached(name), value);
284279
}
@@ -298,7 +293,7 @@ void addConstantsToModuleObject(PythonObject obj) {
298293
if (constant instanceof HiddenAttr attr) {
299294
HiddenAttr.WriteNode.executeUncached(obj, attr, value);
300295
} else {
301-
assert constant instanceof TruffleString || constant instanceof HiddenKey;
296+
assert constant instanceof TruffleString;
302297
obj.setAttribute(constant, value);
303298
}
304299
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyLegacyDef.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ enum HPyLegacySlot {
204204

205205
/**
206206
* The corresponding attribute key (mostly a {@link String} which is the name of a magic
207-
* method, or a {@link com.oracle.truffle.api.object.HiddenKey} if it's not exposed to the
207+
* method, or a {@link com.oracle.graal.python.nodes.HiddenAttr} if it's not exposed to the
208208
* user, or {@code null} if unsupported).
209209
*/
210210
private final TruffleString attributeKey;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
import com.oracle.truffle.api.nodes.Node;
8787
import com.oracle.truffle.api.object.DynamicObject;
8888
import com.oracle.truffle.api.object.DynamicObjectLibrary;
89-
import com.oracle.truffle.api.object.HiddenKey;
9089
import com.oracle.truffle.api.profiles.InlinedBranchProfile;
9190
import com.oracle.truffle.api.profiles.InlinedConditionProfile;
9291
import com.oracle.truffle.api.profiles.InlinedLoopConditionProfile;
@@ -177,10 +176,6 @@ public final Object execute(Node inliningTarget, HashingStorage self, TruffleStr
177176
return execute(null, inliningTarget, self, key);
178177
}
179178

180-
public final Object execute(Node inliningTarget, HashingStorage self, HiddenKey key) {
181-
return execute(null, inliningTarget, self, key);
182-
}
183-
184179
public abstract Object execute(Frame frame, Node inliningTarget, HashingStorage self, Object key);
185180

186181
@Specialization(guards = "isEconomicMapOrEmpty(self)")

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/DescriptorBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static TruffleString doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor sel
105105
}
106106

107107
@Specialization
108-
static TruffleString doHiddenKeyDescriptor(VirtualFrame frame, HiddenKeyDescriptor self,
108+
static TruffleString doHiddenAttrDescriptor(VirtualFrame frame, HiddenAttrDescriptor self,
109109
@Shared @Cached("create(T___QUALNAME__)") GetFixedAttributeNode readQualNameNode,
110110
@Shared("formatter") @Cached SimpleTruffleStringFormatNode simpleTruffleStringFormatNode) {
111111
return simpleTruffleStringFormatNode.format("%s.%s", toStr(readQualNameNode.executeObject(frame, self.getType())), self.getAttr().getName());
@@ -127,7 +127,7 @@ static TruffleString doGetSetDescriptor(GetSetDescriptor self) {
127127
}
128128

129129
@Specialization
130-
static TruffleString doHiddenKeyDescriptor(HiddenKeyDescriptor self,
130+
static TruffleString doHiddenAttrDescriptor(HiddenAttrDescriptor self,
131131
@Cached TruffleString.FromJavaStringNode fromJavaStringNode) {
132132
return fromJavaStringNode.execute(self.getAttr().getName(), TS_ENCODING);
133133
}
@@ -174,7 +174,7 @@ Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Object obj
174174
}
175175

176176
@Specialization
177-
Object doHiddenKeyDescriptor(HiddenKeyDescriptor descr, PythonAbstractObject obj,
177+
Object doHiddenAttrDescriptor(HiddenAttrDescriptor descr, PythonAbstractObject obj,
178178
@Bind("this") Node inliningTarget,
179179
@Cached HiddenAttr.ReadNode readNode) {
180180
Object val = readNode.execute(inliningTarget, obj, descr.getAttr(), PNone.NO_VALUE);
@@ -199,7 +199,7 @@ Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Object obj
199199
}
200200

201201
@Specialization
202-
static Object doHiddenKeyDescriptor(HiddenKeyDescriptor descr, PythonAbstractObject obj, Object value,
202+
static Object doHiddenAttrDescriptor(HiddenAttrDescriptor descr, PythonAbstractObject obj, Object value,
203203
@Bind("this") Node inliningTarget,
204204
@Cached HiddenAttr.WriteNode writeNode) {
205205
writeNode.execute(inliningTarget, obj, descr.getAttr(), value);
@@ -233,7 +233,7 @@ Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Object obj
233233
}
234234

235235
@Specialization
236-
Object doHiddenKeyDescriptor(HiddenKeyDescriptor descr, PythonAbstractObject obj,
236+
Object doHiddenAttrDescriptor(HiddenAttrDescriptor descr, PythonAbstractObject obj,
237237
@Bind("this") Node inliningTarget,
238238
@Cached HiddenAttr.WriteNode writeNode,
239239
@Cached HiddenAttr.ReadNode readNode,

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/GetSetDescriptorTypeBuiltins.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static Object doGetSetDescriptor(GetSetDescriptor self) {
9595
}
9696

9797
@Specialization
98-
static Object doHiddenKeyDescriptor(HiddenKeyDescriptor self) {
98+
static Object doHiddenAttrDescriptor(HiddenAttrDescriptor self) {
9999
return self.getType();
100100
}
101101
}
@@ -112,7 +112,7 @@ TruffleString repr(GetSetDescriptor descr,
112112
}
113113

114114
@Specialization
115-
TruffleString repr(HiddenKeyDescriptor descr,
115+
TruffleString repr(HiddenAttrDescriptor descr,
116116
@Bind("this") Node inliningTarget,
117117
@Shared("gerName") @Cached GetNameNode getName,
118118
@Shared("format") @Cached SimpleTruffleStringFormatNode simpleTruffleStringFormatNode) {
@@ -145,7 +145,7 @@ static Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Obj
145145
}
146146

147147
@Specialization(guards = "!isNone(obj)")
148-
static Object doHiddenKeyDescriptor(VirtualFrame frame, HiddenKeyDescriptor descr, Object obj, @SuppressWarnings("unused") Object type,
148+
static Object doHiddenAttrDescriptor(VirtualFrame frame, HiddenAttrDescriptor descr, Object obj, @SuppressWarnings("unused") Object type,
149149
@Bind("this") Node inliningTarget,
150150
@Shared @Cached DescriptorCheckNode descriptorCheckNode,
151151
@Shared @Cached DescrGetNode getNode) {
@@ -167,7 +167,7 @@ static Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Obj
167167
}
168168

169169
@Specialization
170-
static Object doHiddenKeyDescriptor(VirtualFrame frame, HiddenKeyDescriptor descr, Object obj, Object value,
170+
static Object doHiddenAttrDescriptor(VirtualFrame frame, HiddenAttrDescriptor descr, Object obj, Object value,
171171
@Bind("this") Node inliningTarget,
172172
@Shared @Cached DescriptorCheckNode descriptorCheckNode,
173173
@Shared @Cached DescrSetNode setNode) {
@@ -190,7 +190,7 @@ static Object doGetSetDescriptor(VirtualFrame frame, GetSetDescriptor descr, Obj
190190
}
191191

192192
@Specialization
193-
static Object doHiddenKeyDescriptor(VirtualFrame frame, HiddenKeyDescriptor descr, Object obj,
193+
static Object doHiddenAttrDescriptor(VirtualFrame frame, HiddenAttrDescriptor descr, Object obj,
194194
@Bind("this") Node inliningTarget,
195195
@Shared @Cached DescriptorCheckNode descriptorCheckNode,
196196
@Shared @Cached DescrDeleteNode deleteNode) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/HiddenKeyDescriptor.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/getsetdescriptor/HiddenAttrDescriptor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -45,18 +45,18 @@
4545
import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
4646
import com.oracle.graal.python.nodes.HiddenAttr;
4747

48-
public final class HiddenKeyDescriptor extends PythonBuiltinObject {
49-
private final HiddenAttr key;
48+
public final class HiddenAttrDescriptor extends PythonBuiltinObject {
49+
private final HiddenAttr attr;
5050
private final Object type;
5151

52-
public HiddenKeyDescriptor(PythonLanguage lang, HiddenAttr key, Object type) {
52+
public HiddenAttrDescriptor(PythonLanguage lang, HiddenAttr attr, Object type) {
5353
super(PythonBuiltinClassType.GetSetDescriptor, PythonBuiltinClassType.GetSetDescriptor.getInstanceShape(lang));
54-
this.key = key;
54+
this.attr = attr;
5555
this.type = type;
5656
}
5757

5858
public HiddenAttr getAttr() {
59-
return key;
59+
return attr;
6060
}
6161

6262
public Object getType() {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import com.oracle.truffle.api.nodes.Node;
4747
import com.oracle.truffle.api.object.DynamicObject;
4848
import com.oracle.truffle.api.object.DynamicObjectLibrary;
49-
import com.oracle.truffle.api.object.HiddenKey;
5049
import com.oracle.truffle.api.object.Shape;
5150
import com.oracle.truffle.api.strings.TruffleString;
5251

@@ -121,7 +120,7 @@ public final Object getAttribute(Object key) {
121120
@TruffleBoundary
122121
public void setAttribute(Object nameObj, Object value) {
123122
Object name = assertNoJavaString(nameObj);
124-
assert name instanceof TruffleString || name instanceof HiddenKey : name.getClass().getSimpleName();
123+
assert name instanceof TruffleString : name.getClass().getSimpleName();
125124
CompilerAsserts.neverPartOfCompilation();
126125
DynamicObjectLibrary.getUncached().put(getStorage(), name, assertNoJavaString(value));
127126
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import com.oracle.truffle.api.library.ExportLibrary;
5454
import com.oracle.truffle.api.library.ExportMessage;
5555
import com.oracle.truffle.api.nodes.Node;
56-
import com.oracle.truffle.api.object.HiddenKey;
5756
import com.oracle.truffle.api.strings.TruffleString;
5857
import com.oracle.truffle.api.utilities.TriState;
5958

@@ -74,7 +73,7 @@ public PythonBuiltinClass(PythonLanguage lang, PythonBuiltinClassType builtinCla
7473
@Override
7574
public void setAttribute(Object name, Object value) {
7675
CompilerAsserts.neverPartOfCompilation();
77-
if (name instanceof HiddenKey || !PythonContext.get(null).isCoreInitialized()) {
76+
if (!PythonContext.get(null).isCoreInitialized()) {
7877
setAttributeUnsafe(name, value);
7978
} else {
8079
throw PRaiseNode.raiseUncached(null, TypeError, ErrorMessages.CANT_SET_ATTRIBUTE_R_OF_IMMUTABLE_TYPE_N, PyObjectReprAsTruffleStringNode.executeUncached(name), this);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
import com.oracle.graal.python.builtins.objects.function.PFunction;
149149
import com.oracle.graal.python.builtins.objects.function.PKeyword;
150150
import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
151-
import com.oracle.graal.python.builtins.objects.getsetdescriptor.HiddenKeyDescriptor;
151+
import com.oracle.graal.python.builtins.objects.getsetdescriptor.HiddenAttrDescriptor;
152152
import com.oracle.graal.python.builtins.objects.ints.PInt;
153153
import com.oracle.graal.python.builtins.objects.list.PList;
154154
import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
@@ -2189,7 +2189,7 @@ static PythonClass typeMetaclass(VirtualFrame frame, TruffleString name, PTuple
21892189
throw PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.OverflowError, ErrorMessages.PRIVATE_IDENTIFIER_TOO_LARGE_TO_BE_MANGLED);
21902190
}
21912191
HiddenAttr hiddenSlotAttr = HiddenAttr.createTypeAttrForSlot(toJavaStringNode.execute(mangledName));
2192-
HiddenKeyDescriptor slotDesc = factory.createHiddenKeyDescriptor(hiddenSlotAttr, pythonClass);
2192+
HiddenAttrDescriptor slotDesc = factory.createHiddenAttrDescriptor(hiddenSlotAttr, pythonClass);
21932193
pythonClass.setAttribute(mangledName, slotDesc);
21942194
}
21952195
}

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
import com.oracle.graal.python.builtins.objects.function.Signature;
128128
import com.oracle.graal.python.builtins.objects.generator.PGenerator;
129129
import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
130-
import com.oracle.graal.python.builtins.objects.getsetdescriptor.HiddenKeyDescriptor;
130+
import com.oracle.graal.python.builtins.objects.getsetdescriptor.HiddenAttrDescriptor;
131131
import com.oracle.graal.python.builtins.objects.ints.PInt;
132132
import com.oracle.graal.python.builtins.objects.iterator.PArrayIterator;
133133
import com.oracle.graal.python.builtins.objects.iterator.PBaseSetIterator;
@@ -693,8 +693,8 @@ public final GetSetDescriptor createMemberDescriptor(Object get, Object set, Tru
693693
return trace(new GetSetDescriptor(PythonBuiltinClassType.MemberDescriptor, PythonBuiltinClassType.MemberDescriptor.getInstanceShape(getLanguage()), get, set, name, type, set != null));
694694
}
695695

696-
public final HiddenKeyDescriptor createHiddenKeyDescriptor(HiddenAttr key, Object type) {
697-
return trace(new HiddenKeyDescriptor(getLanguage(), key, type));
696+
public final HiddenAttrDescriptor createHiddenAttrDescriptor(HiddenAttr key, Object type) {
697+
return trace(new HiddenAttrDescriptor(getLanguage(), key, type));
698698
}
699699

700700
public final PDecoratedMethod createClassmethod(Object cls) {

0 commit comments

Comments
 (0)