Skip to content

Commit 469e628

Browse files
committed
[GR-23997] Periodic update of the graal import (2022-06-17).
PullRequest: js/2493
2 parents 4e99b93 + 41c681a commit 469e628

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

common.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@
134134
"common": {},
135135
"linux": {
136136
"packages": {
137-
"binutils": "==2.23.2",
138-
"gcc": "==8.3.0",
137+
"00:devtoolset": "==7",
139138
"cmake": "==3.15.2"
140139
}
141140
},
@@ -163,14 +162,14 @@
163162
},
164163
"linux_amd64": {
165164
"packages": {
166-
"devtoolset": "==7",
167-
"binutils": ">=2.34",
165+
"00:devtoolset": "==7",
166+
"01:binutils": ">=2.34",
168167
"ruby": ">=2.1.0"
169168
}
170169
},
171170
"linux_aarch64": {
172171
"packages": {
173-
"devtoolset": "==7",
172+
"00:devtoolset": "==7",
174173
"ruby": ">=2.1.0"
175174
}
176175
},

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" : "043078c54f480a97e52de5e2fa2ed92be216fff6",
27+
"version" : "df6eaf868a70a24c047ac7e677ffdb7b460450f4",
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/binary/InstanceofNode.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,17 @@ protected boolean doForeignObject(@SuppressWarnings("unused") Object left, @Supp
242242
@Cached ForeignObjectPrototypeNode getForeignPrototypeNode,
243243
@Cached @Shared("getPrototype1Node") GetPrototypeNode getPrototype1Node,
244244
@Cached @Shared("invalidPrototypeBranch") BranchProfile invalidPrototypeBranch) {
245-
Object rightProto = getConstructorPrototype(right, invalidPrototypeBranch);
246-
Object foreignProto = getForeignPrototypeNode.execute(left);
247-
Object foreignProtoProto = getPrototype1Node.execute(foreignProto);
248-
return rightProto == foreignProtoProto;
245+
if (context.isOptionForeignObjectPrototype()) {
246+
Object rightProto = getConstructorPrototype(right, invalidPrototypeBranch);
247+
if (rightProto == getRealm().getDatePrototype()) {
248+
return false;
249+
}
250+
Object foreignProto = getForeignPrototypeNode.execute(left);
251+
Object foreignProtoProto = getPrototype1Node.execute(foreignProto);
252+
return rightProto == foreignProtoProto;
253+
} else {
254+
return false;
255+
}
249256
}
250257

251258
@Specialization(guards = {"!isJSObject(left)", "!isForeignObject(left)", "isJSFunction(right)", "!isBoundFunction(right)"})

0 commit comments

Comments
 (0)