Skip to content

Commit 5916eba

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
[GR-23997] Periodic update of the graal import (2022-06-10).
PullRequest: js/2483
2 parents bfd074d + aad675e commit 5916eba

File tree

10 files changed

+75
-78
lines changed

10 files changed

+75
-78
lines changed

‎common.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"jdks": {
55
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
66
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b02", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b02-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+6-jvmci-22.2-b02", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+6-jvmci-22.2-b02-sulong", "platformspecific": true },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.16+5-jvmci-22.2-b03", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.16+5-jvmci-22.2-b03-sulong", "platformspecific": true },
9+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+9-jvmci-22.2-b03", "platformspecific": true },
10+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+9-jvmci-22.2-b03-sulong", "platformspecific": true },
1111

1212
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02-sulong", "platformspecific": true }
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.4+5-jvmci-22.2-b03", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.4+5-jvmci-22.2-b03-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.4+5-jvmci-22.2-b03-sulong", "platformspecific": true },
16+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+9-jvmci-22.2-b03", "platformspecific": true },
17+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+9-jvmci-22.2-b03-debug", "platformspecific": true },
18+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+9-jvmci-22.2-b03-sulong", "platformspecific": true }
1919
},
2020

2121
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

‎graal-js/mx.graal-js/suite.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "e760eb9b69bd02f93e2054dd30af3419b106e88c",
27+
"version" : "043078c54f480a97e52de5e2fa2ed92be216fff6",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/GlobalScopeLookupNode.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ final boolean doUncached(JSDynamicObject scope,
120120

121121
final boolean isDead(Shape shape) {
122122
Property property = shape.getProperty(varName);
123-
return property != null && property.getLocation().isValue();
123+
assert property == null || !property.getLocation().isConstant() || property.getLocation().getConstantValue() == Dead.instance();
124+
return property != null && property.getLocation().isConstant();
124125
}
125126

126127
final boolean isConstAssignment(Shape shape) {

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/GlobalScopeNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ final Object doUncached(Object scope,
121121

122122
final boolean isDead(Shape shape) {
123123
Property property = shape.getProperty(varName);
124-
return property != null && property.getLocation().isValue() && property.getLocation().get(null) == Dead.instance();
124+
return property != null && property.getLocation().isConstant() && property.getLocation().getConstantValue() == Dead.instance();
125125
}
126126

127127
@Override

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/JSGetOwnPropertyNode.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ static JSClass getJSClassIfOrdinary(JSDynamicObject obj) {
182182
}
183183

184184
/** @see JSNonProxy#ordinaryGetOwnProperty */
185+
@SuppressWarnings("deprecation")
185186
private PropertyDescriptor ordinaryGetOwnProperty(JSDynamicObject thisObj, Property prop) {
186187
assert !JSProxy.isJSProxy(thisObj);
187188
if (hasPropertyBranch.profile(prop == null)) {
@@ -196,7 +197,7 @@ private PropertyDescriptor ordinaryGetOwnProperty(JSDynamicObject thisObj, Prope
196197
}
197198
} else if (isAccessorPropertyBranch.profile(JSProperty.isAccessor(prop))) {
198199
if (needValue) {
199-
Accessor acc = (Accessor) prop.getLocation().get(thisObj, false);
200+
Accessor acc = (Accessor) prop.getLocation().get(thisObj);
200201
d = PropertyDescriptor.createAccessor(acc.getGetter(), acc.getSetter());
201202
} else {
202203
d = PropertyDescriptor.createAccessor(null, null);
@@ -213,9 +214,10 @@ private PropertyDescriptor ordinaryGetOwnProperty(JSDynamicObject thisObj, Prope
213214
return d;
214215
}
215216

217+
@SuppressWarnings("deprecation")
216218
private Object getDataPropertyValue(JSDynamicObject thisObj, Property prop) {
217219
assert JSProperty.isData(prop);
218-
Object value = prop.getLocation().get(thisObj, false);
220+
Object value = prop.getLocation().get(thisObj);
219221
if (JSProperty.isProxy(prop)) {
220222
return getPropertyProxyValue(thisObj, value);
221223
} else {

‎graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/PropertyGetNode.java‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,9 @@
6161
import com.oracle.truffle.api.nodes.NodeCost;
6262
import com.oracle.truffle.api.nodes.NodeInfo;
6363
import com.oracle.truffle.api.nodes.UnexpectedResultException;
64-
import com.oracle.truffle.api.object.BooleanLocation;
65-
import com.oracle.truffle.api.object.DoubleLocation;
6664
import com.oracle.truffle.api.object.DynamicObjectLibrary;
6765
import com.oracle.truffle.api.object.HiddenKey;
68-
import com.oracle.truffle.api.object.IntLocation;
6966
import com.oracle.truffle.api.object.Location;
70-
import com.oracle.truffle.api.object.LongLocation;
7167
import com.oracle.truffle.api.object.Property;
7268
import com.oracle.truffle.api.object.Shape;
7369
import com.oracle.truffle.api.profiles.BranchProfile;
@@ -131,6 +127,7 @@
131127
* @see PropertyNode
132128
* @see GlobalPropertyNode
133129
*/
130+
@SuppressWarnings("deprecation")
134131
public class PropertyGetNode extends PropertyCacheNode<PropertyGetNode.GetCacheNode> {
135132
protected final boolean isGlobal;
136133
protected final boolean getOwnProperty;
@@ -676,12 +673,12 @@ protected Object getValue(Object thisObj, Object receiver, Object defaultValue,
676673

677674
public static final class IntPropertyGetNode extends LinkedPropertyGetNode {
678675

679-
private final IntLocation location;
676+
private final com.oracle.truffle.api.object.IntLocation location;
680677

681678
public IntPropertyGetNode(Property property, ReceiverCheckNode receiverCheck) {
682679
super(receiverCheck);
683680
assert JSProperty.isData(property);
684-
this.location = (IntLocation) property.getLocation();
681+
this.location = (com.oracle.truffle.api.object.IntLocation) property.getLocation();
685682
}
686683

687684
@Override
@@ -702,14 +699,14 @@ protected double getValueDouble(Object thisObj, Object receiver, PropertyGetNode
702699

703700
public static final class FinalIntPropertyGetNode extends AbstractFinalPropertyGetNode {
704701

705-
private final IntLocation location;
702+
private final com.oracle.truffle.api.object.IntLocation location;
706703
private final int finalValue;
707704

708705
public FinalIntPropertyGetNode(Property property, AbstractShapeCheckNode shapeCheck, int value, JSDynamicObject expectedObj) {
709706
super(property, shapeCheck, expectedObj);
710707
assert JSProperty.isData(property);
711708
this.finalValue = value;
712-
this.location = (IntLocation) property.getLocation();
709+
this.location = (com.oracle.truffle.api.object.IntLocation) property.getLocation();
713710
}
714711

715712
@Override
@@ -735,12 +732,12 @@ protected double getValueDouble(Object thisObj, Object receiver, PropertyGetNode
735732

736733
public static final class DoublePropertyGetNode extends LinkedPropertyGetNode {
737734

738-
private final DoubleLocation location;
735+
private final com.oracle.truffle.api.object.DoubleLocation location;
739736

740737
public DoublePropertyGetNode(Property property, ReceiverCheckNode receiverCheck) {
741738
super(receiverCheck);
742739
assert JSProperty.isData(property);
743-
this.location = (DoubleLocation) property.getLocation();
740+
this.location = (com.oracle.truffle.api.object.DoubleLocation) property.getLocation();
744741
}
745742

746743
@Override
@@ -757,13 +754,13 @@ protected double getValueDouble(Object thisObj, Object receiver, PropertyGetNode
757754
public static final class FinalDoublePropertyGetNode extends AbstractFinalPropertyGetNode {
758755

759756
private final double finalValue;
760-
private final DoubleLocation location;
757+
private final com.oracle.truffle.api.object.DoubleLocation location;
761758

762759
public FinalDoublePropertyGetNode(Property property, AbstractShapeCheckNode shapeCheck, double value, JSDynamicObject expectedObj) {
763760
super(property, shapeCheck, expectedObj);
764761
assert JSProperty.isData(property);
765762
this.finalValue = value;
766-
this.location = (DoubleLocation) property.getLocation();
763+
this.location = (com.oracle.truffle.api.object.DoubleLocation) property.getLocation();
767764
}
768765

769766
@Override
@@ -784,12 +781,12 @@ protected double getValueDouble(Object thisObj, Object receiver, PropertyGetNode
784781

785782
public static final class BooleanPropertyGetNode extends LinkedPropertyGetNode {
786783

787-
private final BooleanLocation location;
784+
private final com.oracle.truffle.api.object.BooleanLocation location;
788785

789786
public BooleanPropertyGetNode(Property property, ReceiverCheckNode receiverCheck) {
790787
super(receiverCheck);
791788
assert JSProperty.isData(property);
792-
this.location = (BooleanLocation) property.getLocation();
789+
this.location = (com.oracle.truffle.api.object.BooleanLocation) property.getLocation();
793790
}
794791

795792
@Override
@@ -806,13 +803,13 @@ protected boolean getValueBoolean(Object thisObj, Object receiver, PropertyGetNo
806803
public static final class FinalBooleanPropertyGetNode extends AbstractFinalPropertyGetNode {
807804

808805
private final boolean finalValue;
809-
private final BooleanLocation location;
806+
private final com.oracle.truffle.api.object.BooleanLocation location;
810807

811808
public FinalBooleanPropertyGetNode(Property property, AbstractShapeCheckNode shapeCheck, boolean value, JSDynamicObject expectedObj) {
812809
super(property, shapeCheck, expectedObj);
813810
assert JSProperty.isData(property);
814811
this.finalValue = value;
815-
this.location = (BooleanLocation) property.getLocation();
812+
this.location = (com.oracle.truffle.api.object.BooleanLocation) property.getLocation();
816813
}
817814

818815
@Override
@@ -833,12 +830,12 @@ protected boolean getValueBoolean(Object thisObj, Object receiver, PropertyGetNo
833830

834831
public static final class LongPropertyGetNode extends LinkedPropertyGetNode {
835832

836-
private final LongLocation location;
833+
private final com.oracle.truffle.api.object.LongLocation location;
837834

838835
public LongPropertyGetNode(Property property, ReceiverCheckNode receiverCheck) {
839836
super(receiverCheck);
840837
assert JSProperty.isData(property);
841-
this.location = (LongLocation) property.getLocation();
838+
this.location = (com.oracle.truffle.api.object.LongLocation) property.getLocation();
842839
}
843840

844841
@Override
@@ -855,13 +852,13 @@ protected long getValueLong(Object thisObj, Object receiver, PropertyGetNode roo
855852
public static final class FinalLongPropertyGetNode extends AbstractFinalPropertyGetNode {
856853

857854
private final long finalValue;
858-
private final LongLocation location;
855+
private final com.oracle.truffle.api.object.LongLocation location;
859856

860857
public FinalLongPropertyGetNode(Property property, AbstractShapeCheckNode shapeCheck, long value, JSDynamicObject expectedObj) {
861858
super(property, shapeCheck, expectedObj);
862859
assert JSProperty.isData(property);
863860
this.finalValue = value;
864-
this.location = (LongLocation) property.getLocation();
861+
this.location = (com.oracle.truffle.api.object.LongLocation) property.getLocation();
865862
}
866863

867864
@Override
@@ -1921,13 +1918,13 @@ private GetCacheNode createCachedPropertyNodeNotJSObject(Property property, Obje
19211918
private static GetCacheNode createSpecializationFromDataProperty(Property property, ReceiverCheckNode receiverCheck, JSContext context) {
19221919
Property dataProperty = property;
19231920

1924-
if (property.getLocation() instanceof IntLocation) {
1921+
if (property.getLocation() instanceof com.oracle.truffle.api.object.IntLocation) {
19251922
return new IntPropertyGetNode(dataProperty, receiverCheck);
1926-
} else if (property.getLocation() instanceof DoubleLocation) {
1923+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.DoubleLocation) {
19271924
return new DoublePropertyGetNode(dataProperty, receiverCheck);
1928-
} else if (property.getLocation() instanceof BooleanLocation) {
1925+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.BooleanLocation) {
19291926
return new BooleanPropertyGetNode(dataProperty, receiverCheck);
1930-
} else if (property.getLocation() instanceof LongLocation) {
1927+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.LongLocation) {
19311928
return new LongPropertyGetNode(dataProperty, receiverCheck);
19321929
} else if (JSProperty.isProxy(property)) {
19331930
if (isArrayLengthProperty(property)) {
@@ -1960,16 +1957,16 @@ private GetCacheNode createFinalDataPropertySpecialization(Property property, Sh
19601957

19611958
JSDynamicObject constObjOrNull = isConstantObjectFinal ? thisObj : null;
19621959
try {
1963-
if (property.getLocation() instanceof IntLocation) {
1960+
if (property.getLocation() instanceof com.oracle.truffle.api.object.IntLocation) {
19641961
int intValue = DynamicObjectLibrary.getUncached().getIntOrDefault(store, key, null);
19651962
return new FinalIntPropertyGetNode(property, finalShapeCheckNode, intValue, constObjOrNull);
1966-
} else if (property.getLocation() instanceof DoubleLocation) {
1963+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.DoubleLocation) {
19671964
double doubleValue = DynamicObjectLibrary.getUncached().getDoubleOrDefault(store, key, null);
19681965
return new FinalDoublePropertyGetNode(property, finalShapeCheckNode, doubleValue, constObjOrNull);
1969-
} else if (property.getLocation() instanceof BooleanLocation) {
1966+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.BooleanLocation) {
19701967
boolean boolValue = (boolean) DynamicObjectLibrary.getUncached().getOrDefault(store, key, null);
19711968
return new FinalBooleanPropertyGetNode(property, finalShapeCheckNode, boolValue, constObjOrNull);
1972-
} else if (property.getLocation() instanceof LongLocation) {
1969+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.LongLocation) {
19731970
long longValue = DynamicObjectLibrary.getUncached().getLongOrDefault(store, key, null);
19741971
return new FinalLongPropertyGetNode(property, finalShapeCheckNode, longValue, constObjOrNull);
19751972
} else {
@@ -2145,13 +2142,13 @@ protected boolean canCombineShapeCheck(Shape parentShape, Shape cacheShape, Obje
21452142
protected GetCacheNode createCombinedIcPropertyNode(Shape parentShape, Shape cacheShape, Object thisObj, int depth, Object value, Property property) {
21462143
CombinedShapeCheckNode receiverCheck = new CombinedShapeCheckNode(parentShape, cacheShape);
21472144

2148-
if (property.getLocation() instanceof IntLocation) {
2145+
if (property.getLocation() instanceof com.oracle.truffle.api.object.IntLocation) {
21492146
return new IntPropertyGetNode(property, receiverCheck);
2150-
} else if (property.getLocation() instanceof DoubleLocation) {
2147+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.DoubleLocation) {
21512148
return new DoublePropertyGetNode(property, receiverCheck);
2152-
} else if (property.getLocation() instanceof BooleanLocation) {
2149+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.BooleanLocation) {
21532150
return new BooleanPropertyGetNode(property, receiverCheck);
2154-
} else if (property.getLocation() instanceof LongLocation) {
2151+
} else if (property.getLocation() instanceof com.oracle.truffle.api.object.LongLocation) {
21552152
return new LongPropertyGetNode(property, receiverCheck);
21562153
} else {
21572154
assert !JSProperty.isProxy(property);

0 commit comments

Comments
 (0)