Skip to content

Commit 0dc7cec

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

File tree

2 files changed

+63
-3
lines changed

2 files changed

+63
-3
lines changed

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,9 @@ static Lookup internalLookup() {
362362
@ImportStatic(DynamicObject.class)
363363
public abstract static class GetNode extends Node {
364364

365+
GetNode() {
366+
}
367+
365368
/**
366369
* @since 25.1
367370
*/
@@ -599,6 +602,9 @@ static Object doGeneric(DynamicObject receiver, Object key, Object defaultValue)
599602
@GenerateInline(false)
600603
public abstract static class PutNode extends Node {
601604

605+
PutNode() {
606+
}
607+
602608
/**
603609
* @since 25.1
604610
*/
@@ -910,6 +916,9 @@ static Location getNewLocation(Shape oldShape, Shape newShape, Object cachedKey,
910916
@GenerateInline(false)
911917
public abstract static class CopyPropertiesNode extends Node {
912918

919+
CopyPropertiesNode() {
920+
}
921+
913922
/**
914923
* @since 25.1
915924
*/
@@ -987,6 +996,9 @@ static boolean updateShape(DynamicObject object) {
987996
@GenerateInline(false)
988997
public abstract static class ContainsKeyNode extends Node {
989998

999+
ContainsKeyNode() {
1000+
}
1001+
9901002
/**
9911003
* @since 25.1
9921004
*/
@@ -1051,6 +1063,9 @@ static boolean doUncached(DynamicObject receiver, Object key) {
10511063
@GenerateInline(false)
10521064
public abstract static class RemoveKeyNode extends Node {
10531065

1066+
RemoveKeyNode() {
1067+
}
1068+
10541069
/**
10551070
* @since 25.1
10561071
*/
@@ -1171,6 +1186,9 @@ static RemovePlan makeRemovePlanOrNull(Shape oldShape, Shape newShape, Property
11711186
@GenerateInline(false)
11721187
public abstract static class GetShapeFlagsNode extends Node {
11731188

1189+
GetShapeFlagsNode() {
1190+
}
1191+
11741192
/**
11751193
* @since 25.1
11761194
*/
@@ -1250,6 +1268,9 @@ static int doUncached(DynamicObject receiver) {
12501268
@GenerateInline(false)
12511269
public abstract static class HasShapeFlagsNode extends Node {
12521270

1271+
HasShapeFlagsNode() {
1272+
}
1273+
12531274
/**
12541275
* @since 25.1
12551276
*/
@@ -1327,6 +1348,9 @@ static boolean doUncached(DynamicObject receiver, int flags) {
13271348
@GenerateInline(false)
13281349
public abstract static class SetShapeFlagsNode extends Node {
13291350

1351+
SetShapeFlagsNode() {
1352+
}
1353+
13301354
/**
13311355
* @since 25.1
13321356
*/
@@ -1421,6 +1445,9 @@ static Shape shapeSetFlags(Shape shape, int newFlags) {
14211445
@GenerateInline(false)
14221446
public abstract static class AddShapeFlagsNode extends Node {
14231447

1448+
AddShapeFlagsNode() {
1449+
}
1450+
14241451
/**
14251452
* @since 25.1
14261453
*/
@@ -1522,6 +1549,9 @@ static Shape shapeAddFlags(Shape shape, int newFlags) {
15221549
@GenerateInline(false)
15231550
public abstract static class IsSharedNode extends Node {
15241551

1552+
IsSharedNode() {
1553+
}
1554+
15251555
/**
15261556
* @since 25.1
15271557
*/
@@ -1574,6 +1604,9 @@ static boolean doUncached(DynamicObject receiver) {
15741604
@GenerateInline(false)
15751605
public abstract static class MarkSharedNode extends Node {
15761606

1607+
MarkSharedNode() {
1608+
}
1609+
15771610
/**
15781611
* @since 25.1
15791612
*/
@@ -1644,6 +1677,9 @@ static boolean doUncached(DynamicObject receiver,
16441677
@GenerateInline(false)
16451678
public abstract static class GetDynamicTypeNode extends Node {
16461679

1680+
GetDynamicTypeNode() {
1681+
}
1682+
16471683
/**
16481684
* @since 25.1
16491685
*/
@@ -1697,6 +1733,9 @@ static Object doUncached(DynamicObject receiver) {
16971733
@GenerateInline(false)
16981734
public abstract static class SetDynamicTypeNode extends Node {
16991735

1736+
SetDynamicTypeNode() {
1737+
}
1738+
17001739
/**
17011740
* @since 25.1
17021741
*/
@@ -1772,6 +1811,9 @@ static boolean doUncached(DynamicObject receiver, Object objectType,
17721811
@GenerateInline(false)
17731812
public abstract static class GetPropertyFlagsNode extends Node {
17741813

1814+
GetPropertyFlagsNode() {
1815+
}
1816+
17751817
/**
17761818
* @since 25.1
17771819
*/
@@ -1843,6 +1885,9 @@ static int doUncached(DynamicObject receiver, Object key, int defaultValue) {
18431885
@GenerateInline(false)
18441886
public abstract static class SetPropertyFlagsNode extends Node {
18451887

1888+
SetPropertyFlagsNode() {
1889+
}
1890+
18461891
/**
18471892
* @since 25.1
18481893
*/
@@ -1960,6 +2005,9 @@ static void maybeUpdateShape(DynamicObject store, Shape newShape) {
19602005
@GenerateInline(false)
19612006
public abstract static class UpdateShapeNode extends Node {
19622007

2008+
UpdateShapeNode() {
2009+
}
2010+
19632011
/**
19642012
* @since 25.1
19652013
*/
@@ -2024,6 +2072,9 @@ static boolean doInvalid(DynamicObject receiver) {
20242072
@GenerateInline(false)
20252073
public abstract static class ResetShapeNode extends Node {
20262074

2075+
ResetShapeNode() {
2076+
}
2077+
20272078
/**
20282079
* @since 25.1
20292080
*/
@@ -2096,6 +2147,9 @@ static Shape verifyResetShape(Shape currentShape, Shape otherShape) {
20962147
@GenerateInline(false)
20972148
public abstract static class GetPropertyNode extends Node {
20982149

2150+
GetPropertyNode() {
2151+
}
2152+
20992153
/**
21002154
* @since 25.1
21012155
*/
@@ -2148,6 +2202,9 @@ static Property doUncached(DynamicObject receiver, Object key) {
21482202
@GenerateInline(false)
21492203
public abstract static class GetKeyArrayNode extends Node {
21502204

2205+
GetKeyArrayNode() {
2206+
}
2207+
21512208
/**
21522209
* @since 25.1
21532210
*/
@@ -2253,6 +2310,9 @@ static Object[] getKeyArray(Shape shape) {
22532310
@GenerateInline(false)
22542311
public abstract static class GetPropertyArrayNode extends Node {
22552312

2313+
GetPropertyArrayNode() {
2314+
}
2315+
22562316
/**
22572317
* @since 25.1
22582318
*/

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)