Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass the receiver to get_property_on_prototype (fixes #11600) #13017

Merged
merged 3 commits into from Aug 25, 2016
Merged

Pass the receiver to get_property_on_prototype (fixes #11600) #13017

merged 3 commits into from Aug 25, 2016

Conversation

@nox
Copy link
Member

nox commented Aug 24, 2016 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented Aug 24, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/bindings/codegen/CodegenRust.py, components/script/dom/bindings/utils.rs
@highfive
Copy link

highfive commented Aug 24, 2016

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@jdm
Copy link
Member

jdm commented Aug 24, 2016

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

⌛ Trying commit 11f29bb with merge 1148908...
bors-servo added a commit that referenced this pull request Aug 24, 2016
@bors-servo
Auto merge of #13017 - nox:wrong-receiver, r=<try>
Loading status checks…
1148908 
Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 24, 2016

r+ if it passes
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

💔 Test failed - mac-rel-wpt
@nox nox force-pushed the nox:wrong-receiver branch from 11f29bb to e8244eb Aug 24, 2016
@nox
Copy link
Member Author

nox commented Aug 24, 2016

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

⌛ Trying commit e8244eb with merge 662f3d8...
bors-servo added a commit that referenced this pull request Aug 24, 2016
@bors-servo
Auto merge of #13017 - nox:wrong-receiver, r=<try>
Loading status checks…
662f3d8 
Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

💔 Test failed - mac-rel-wpt
components/script/dom/bindings/codegen/CodegenRust.py Outdated
if !has_property_on_prototype(cx, proxy, id, &mut has_on_proto) {
return false;
}
if has_on_proto {

This comment has been minimized.

Sign in to view
Copy link
@jdm

jdm Aug 24, 2016

Member

This should be if !has_on_proto

This comment has been minimized.

Sign in to view
Copy link
@nox

nox Aug 24, 2016

Author Member

Ah right, thanks.
@jdm jdm removed the S-awaiting-review label Aug 24, 2016
@nox nox force-pushed the nox:wrong-receiver branch from e8244eb to 339bcb6 Aug 24, 2016
@nox
Copy link
Member Author

nox commented Aug 24, 2016

@bors-servo try
bors-servo added a commit that referenced this pull request Aug 24, 2016
@bors-servo
Auto merge of #13017 - nox:wrong-receiver, r=<try>
Loading status checks…
f5fdffa 
Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

⌛ Trying commit 339bcb6 with merge f5fdffa...
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@jdm
Copy link
Member

jdm commented Aug 24, 2016

@bors-servo: r=Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 24, 2016

📌 Commit 339bcb6 has been approved by Ms2ger
@highfive highfive assigned Ms2ger and unassigned jdm Aug 24, 2016
nox added 3 commits Aug 24, 2016
@nox
Mark get_property_on_prototype and has_property_on_prototype as unsafe
fbc8938
@nox
Make has_property_on_prototype fallible
f70fa98
@nox
Pass the receiver to get_property_on_prototype (fixes #11600)
Loading status checks…
6c1167b
@nox nox force-pushed the nox:wrong-receiver branch from 339bcb6 to 6c1167b Aug 25, 2016
@nox
Copy link
Member Author

nox commented Aug 25, 2016

@bors-servo r=Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2016

📌 Commit 6c1167b has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2016

⌛ Testing commit 6c1167b with merge 6989d64...
bors-servo added a commit that referenced this pull request Aug 25, 2016
@bors-servo
Auto merge of #13017 - nox:wrong-receiver, r=Ms2ger
Loading status checks…
6989d64 
Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2016

💔 Test failed - mac-rel-wpt
@nox
Copy link
Member Author

nox commented Aug 25, 2016

@bors-servo retry #11100
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2016

⌛ Testing commit 6c1167b with merge 160d156...
bors-servo added a commit that referenced this pull request Aug 25, 2016
@bors-servo
Auto merge of #13017 - nox:wrong-receiver, r=Ms2ger
Loading status checks…
160d156 
Pass the receiver to get_property_on_prototype (fixes #11600)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13017)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2016

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev
@bors-servo bors-servo merged commit 6c1167b into servo:master Aug 25, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox deleted the nox:wrong-receiver branch Aug 26, 2016
@emilio emilio mentioned this pull request Sep 6, 2016
Closed
components/script/dom/bindings/codegen/CodegenRust.py
if RUST_JSID_IS_STRING(id) {
let mut has_on_proto = false;
if !has_property_on_prototype(cx, proxy, id, &mut has_on_proto) {
return false;

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Sep 6, 2016 •
edited

Member

Shouldn't this set *bp = false? (sorry if it's a dumb question, I was digging into the reason for #13165 and arrived here).

Edit: Yeah, it's probably a dumb question, I expect the outparam to be ignored if we return false, gah.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@nox @highfive @jdm @bors-servo @Ms2ger @emilio
You can’t perform that action at this time.