Skip to content
This repository has been archived by the owner on Nov 12, 2022. It is now read-only.

Update SpiderMonkey to 97 #556

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Update SpiderMonkey to 97 #556

wants to merge 2 commits into from

Conversation

CYBAI
Copy link
Member

@CYBAI CYBAI commented Feb 20, 2022

The mozjs PR is at servo/mozjs#295


  • Change the mozjs_sys back to the servo one with new revision in Cargo.toml

@@ -1062,13 +1087,13 @@ CallUnbarrieredObjectTracer(JSTracer* trc, JSObject** objp, const char* name)
void
CallObjectRootTracer(JSTracer* trc, JSObject** objp, const char* name)
{
JS::UnsafeTraceRoot(trc, objp, name);
JS::TraceRoot(trc, objp, name);
Copy link
Member Author

Choose a reason for hiding this comment

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

bors-servo added a commit to servo/servo that referenced this pull request Mar 17, 2022
[WIP] Upgrade to SpiderMonkey 97

This should be merged after servo/mozjs#295 and servo/rust-mozjs#556 merged.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
- [x] There are tests for these changes (We need to confirm this smup will break or fix which tests)
bors-servo added a commit to servo/servo that referenced this pull request Apr 15, 2022
[WIP] Upgrade to SpiderMonkey 97

This should be merged after servo/mozjs#295 and servo/rust-mozjs#556 merged.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
- [x] There are tests for these changes (We need to confirm this smup will break or fix which tests)
bors-servo added a commit to servo/servo that referenced this pull request Apr 24, 2022
[WIP] Upgrade to SpiderMonkey 97

This should be merged after servo/mozjs#295 and servo/rust-mozjs#556 merged.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
- [x] There are tests for these changes (We need to confirm this smup will break or fix which tests)
bors-servo added a commit to servo/servo that referenced this pull request Aug 29, 2022
[WIP] Upgrade to SpiderMonkey 97

This should be merged after servo/mozjs#295 and servo/rust-mozjs#556 merged.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
- [x] There are tests for these changes (We need to confirm this smup will break or fix which tests)
bors-servo added a commit to servo/servo that referenced this pull request Aug 30, 2022
[WIP] Upgrade to SpiderMonkey 97

This should be merged after servo/mozjs#295 and servo/rust-mozjs#556 merged.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)
- [x] There are tests for these changes (We need to confirm this smup will break or fix which tests)
@bors-servo
Copy link
Contributor

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants