Skip to content

Commit 0a23ad8

Browse files
committed
Make Node constructors and internal methods package-private.
1 parent 8a93c69 commit 0a23ad8

File tree

2 files changed

+64
-3
lines changed

2 files changed

+64
-3
lines changed

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,16 @@ static Lookup internalLookup() {
356356
* @see #getDoubleOrDefault(DynamicObject, Object, Object)
357357
* @since 25.1
358358
*/
359+
@GeneratePackagePrivate
359360
@GenerateCached(true)
360361
@GenerateInline(false)
361362
@GenerateUncached
362363
@ImportStatic(DynamicObject.class)
363364
public abstract static class GetNode extends Node {
364365

366+
GetNode() {
367+
}
368+
365369
/**
366370
* @since 25.1
367371
*/
@@ -599,6 +603,9 @@ static Object doGeneric(DynamicObject receiver, Object key, Object defaultValue)
599603
@GenerateInline(false)
600604
public abstract static class PutNode extends Node {
601605

606+
PutNode() {
607+
}
608+
602609
/**
603610
* @since 25.1
604611
*/
@@ -910,6 +917,9 @@ static Location getNewLocation(Shape oldShape, Shape newShape, Object cachedKey,
910917
@GenerateInline(false)
911918
public abstract static class CopyPropertiesNode extends Node {
912919

920+
CopyPropertiesNode() {
921+
}
922+
913923
/**
914924
* @since 25.1
915925
*/
@@ -987,6 +997,9 @@ static boolean updateShape(DynamicObject object) {
987997
@GenerateInline(false)
988998
public abstract static class ContainsKeyNode extends Node {
989999

1000+
ContainsKeyNode() {
1001+
}
1002+
9901003
/**
9911004
* @since 25.1
9921005
*/
@@ -1051,6 +1064,9 @@ static boolean doUncached(DynamicObject receiver, Object key) {
10511064
@GenerateInline(false)
10521065
public abstract static class RemoveKeyNode extends Node {
10531066

1067+
RemoveKeyNode() {
1068+
}
1069+
10541070
/**
10551071
* @since 25.1
10561072
*/
@@ -1171,6 +1187,9 @@ static RemovePlan makeRemovePlanOrNull(Shape oldShape, Shape newShape, Property
11711187
@GenerateInline(false)
11721188
public abstract static class GetShapeFlagsNode extends Node {
11731189

1190+
GetShapeFlagsNode() {
1191+
}
1192+
11741193
/**
11751194
* @since 25.1
11761195
*/
@@ -1250,6 +1269,9 @@ static int doUncached(DynamicObject receiver) {
12501269
@GenerateInline(false)
12511270
public abstract static class HasShapeFlagsNode extends Node {
12521271

1272+
HasShapeFlagsNode() {
1273+
}
1274+
12531275
/**
12541276
* @since 25.1
12551277
*/
@@ -1327,6 +1349,9 @@ static boolean doUncached(DynamicObject receiver, int flags) {
13271349
@GenerateInline(false)
13281350
public abstract static class SetShapeFlagsNode extends Node {
13291351

1352+
SetShapeFlagsNode() {
1353+
}
1354+
13301355
/**
13311356
* @since 25.1
13321357
*/
@@ -1421,6 +1446,9 @@ static Shape shapeSetFlags(Shape shape, int newFlags) {
14211446
@GenerateInline(false)
14221447
public abstract static class AddShapeFlagsNode extends Node {
14231448

1449+
AddShapeFlagsNode() {
1450+
}
1451+
14241452
/**
14251453
* @since 25.1
14261454
*/
@@ -1522,6 +1550,9 @@ static Shape shapeAddFlags(Shape shape, int newFlags) {
15221550
@GenerateInline(false)
15231551
public abstract static class IsSharedNode extends Node {
15241552

1553+
IsSharedNode() {
1554+
}
1555+
15251556
/**
15261557
* @since 25.1
15271558
*/
@@ -1574,6 +1605,9 @@ static boolean doUncached(DynamicObject receiver) {
15741605
@GenerateInline(false)
15751606
public abstract static class MarkSharedNode extends Node {
15761607

1608+
MarkSharedNode() {
1609+
}
1610+
15771611
/**
15781612
* @since 25.1
15791613
*/
@@ -1644,6 +1678,9 @@ static boolean doUncached(DynamicObject receiver,
16441678
@GenerateInline(false)
16451679
public abstract static class GetDynamicTypeNode extends Node {
16461680

1681+
GetDynamicTypeNode() {
1682+
}
1683+
16471684
/**
16481685
* @since 25.1
16491686
*/
@@ -1697,6 +1734,9 @@ static Object doUncached(DynamicObject receiver) {
16971734
@GenerateInline(false)
16981735
public abstract static class SetDynamicTypeNode extends Node {
16991736

1737+
SetDynamicTypeNode() {
1738+
}
1739+
17001740
/**
17011741
* @since 25.1
17021742
*/
@@ -1772,6 +1812,9 @@ static boolean doUncached(DynamicObject receiver, Object objectType,
17721812
@GenerateInline(false)
17731813
public abstract static class GetPropertyFlagsNode extends Node {
17741814

1815+
GetPropertyFlagsNode() {
1816+
}
1817+
17751818
/**
17761819
* @since 25.1
17771820
*/
@@ -1843,6 +1886,9 @@ static int doUncached(DynamicObject receiver, Object key, int defaultValue) {
18431886
@GenerateInline(false)
18441887
public abstract static class SetPropertyFlagsNode extends Node {
18451888

1889+
SetPropertyFlagsNode() {
1890+
}
1891+
18461892
/**
18471893
* @since 25.1
18481894
*/
@@ -1960,6 +2006,9 @@ static void maybeUpdateShape(DynamicObject store, Shape newShape) {
19602006
@GenerateInline(false)
19612007
public abstract static class UpdateShapeNode extends Node {
19622008

2009+
UpdateShapeNode() {
2010+
}
2011+
19632012
/**
19642013
* @since 25.1
19652014
*/
@@ -2024,6 +2073,9 @@ static boolean doInvalid(DynamicObject receiver) {
20242073
@GenerateInline(false)
20252074
public abstract static class ResetShapeNode extends Node {
20262075

2076+
ResetShapeNode() {
2077+
}
2078+
20272079
/**
20282080
* @since 25.1
20292081
*/
@@ -2096,6 +2148,9 @@ static Shape verifyResetShape(Shape currentShape, Shape otherShape) {
20962148
@GenerateInline(false)
20972149
public abstract static class GetPropertyNode extends Node {
20982150

2151+
GetPropertyNode() {
2152+
}
2153+
20992154
/**
21002155
* @since 25.1
21012156
*/
@@ -2148,6 +2203,9 @@ static Property doUncached(DynamicObject receiver, Object key) {
21482203
@GenerateInline(false)
21492204
public abstract static class GetKeyArrayNode extends Node {
21502205

2206+
GetKeyArrayNode() {
2207+
}
2208+
21512209
/**
21522210
* @since 25.1
21532211
*/
@@ -2253,6 +2311,9 @@ static Object[] getKeyArray(Shape shape) {
22532311
@GenerateInline(false)
22542312
public abstract static class GetPropertyArrayNode extends Node {
22552313

2314+
GetPropertyArrayNode() {
2315+
}
2316+
22562317
/**
22572318
* @since 25.1
22582319
*/

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Shape.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import java.util.function.IntPredicate;
6363
import java.util.function.Predicate;
6464

65-
import com.oracle.truffle.api.impl.AbstractAssumption;
6665
import org.graalvm.collections.EconomicMap;
6766
import org.graalvm.collections.Equivalence;
6867
import org.graalvm.collections.Pair;
@@ -75,6 +74,7 @@
7574
import com.oracle.truffle.api.Truffle;
7675
import com.oracle.truffle.api.dsl.Idempotent;
7776
import com.oracle.truffle.api.dsl.NonIdempotent;
77+
import com.oracle.truffle.api.impl.AbstractAssumption;
7878

7979
/**
8080
* A Shape is an immutable descriptor of the current object "shape" of a DynamicObject, i.e., object
@@ -742,7 +742,7 @@ protected Shape defineProperty(Object key, Object value, int propertyFlags, int
742742
}
743743

744744
@TruffleBoundary
745-
protected Shape defineProperty(Object key, Object value, int propertyFlags, int putFlags, Property existing) {
745+
Shape defineProperty(Object key, Object value, int propertyFlags, int putFlags, Property existing) {
746746
return ObsolescenceStrategy.defineProperty(this, key, value, propertyFlags, existing, putFlags);
747747
}
748748

@@ -940,7 +940,7 @@ protected Shape replaceProperty(Property oldProperty, Property newProperty) {
940940
}
941941

942942
@TruffleBoundary
943-
protected Shape setPropertyFlags(Property oldProperty, int newFlags) {
943+
Shape setPropertyFlags(Property oldProperty, int newFlags) {
944944
if (oldProperty.getFlags() == newFlags) {
945945
return this;
946946
}

0 commit comments

Comments
 (0)