Skip to content

Conversation

ghost
Copy link

@ghost ghost commented Apr 1, 2016

When creating a runtime (script.rs), we check prefs and then enable or
disable the JITs (Baseline and Ion) accordingly.

Closes #10278.


This change is Reviewable

@highfive
Copy link

highfive commented Apr 1, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/script_thread.rs

@highfive
Copy link

highfive commented Apr 1, 2016

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 1, 2016
@paulrouget
Copy link
Contributor

We should start documenting these preferences somewhere.

@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 1, 2016

Could you add these to resources/prefs.json with the default value true? This will provide one easy way to discover and flip these prefs. Thanks!

Also, ./mach test-tidy failed:

./components/script/script_thread.rs:61: use statement is not in alphabetical order
    expected: js::jsapi::{JSObject, SetPreserveWrapperCallback}
    found: js::jsapi::RuntimeOptionsRef

@mbrubeck mbrubeck added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. S-fails-tidy `./mach test-tidy` reported errors. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 1, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Apr 1, 2016
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #10336) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Apr 2, 2016
@jdm jdm removed S-fails-tidy `./mach test-tidy` reported errors. S-needs-rebase There are merge conflict errors. labels Apr 2, 2016
unsafe {
let rt_opts = RuntimeOptionsRef(runtime.rt());
is_baseline_enabled.map(|val| (*rt_opts).set_baseline_(val));
is_ion_enabled.map(|val| (*rt_opts).set_ion_(val));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed this before: Could you change this to use if let instead of .map()? This is purely a style preference; we find it more readable than map in cases where the return value isn't used.

r=mbrubeck with that change

@jdm jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 4, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Apr 4, 2016
When creating a runtime (script.rs), we check prefs and then enable or
disable the JITs (Baseline and Ion).
@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 4, 2016

@bors-servo r+

1 similar comment
@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 4, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 3ad7119 has been approved by mbrubeck

1 similar comment
@bors-servo
Copy link
Contributor

📌 Commit 3ad7119 has been approved by mbrubeck

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Apr 4, 2016
@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 4, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Contributor

📌 Commit 3ad7119 has been approved by mbrubeck

@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 4, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Contributor

📌 Commit 3ad7119 has been approved by mbrubeck

@bors-servo
Copy link
Contributor

⌛ Testing commit 3ad7119 with merge 60e5755...

bors-servo pushed a commit that referenced this pull request Apr 4, 2016
Add preferences to enable/disable the JITs

When creating a runtime (script.rs), we check prefs and then enable or
disable the JITs (Baseline and Ion) accordingly.

Closes #10278.

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

💔 Test failed - linux-rel

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Apr 4, 2016
@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 4, 2016

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt, status-appveyor are reusable. Rebuilding only linux-rel...

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Apr 4, 2016
@mbrubeck
Copy link
Contributor

mbrubeck commented Apr 5, 2016

@bors-servo
Copy link
Contributor

⌛ Testing commit 3ad7119 with merge 863c905...

bors-servo pushed a commit that referenced this pull request Apr 5, 2016
Add preferences to enable/disable the JITs

When creating a runtime (script.rs), we check prefs and then enable or
disable the JITs (Baseline and Ion) accordingly.

Closes #10278.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10325)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Apr 5, 2016
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, status-appveyor

@bors-servo bors-servo merged commit 3ad7119 into servo:master Apr 5, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Apr 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants