Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

src,test: enable per_context.js shim #600

Merged
merged 1 commit into from
Sep 20, 2018

Conversation

kfarnung
Copy link
Contributor

@kfarnung kfarnung commented Sep 18, 2018

This change requires a new version of ChakraCore, making the change in chakracore-master branch for now to get some testing

This reverts commit f5d29d5. It also
updates the shim to use shim wake using notify.

Refs: #565
Refs: #567

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@kfarnung kfarnung self-assigned this Sep 18, 2018
@kfarnung
Copy link
Contributor Author

@MSLaguana
Copy link
Contributor

LGTM if tests pass; what changed to make the intl initialization not fatal? Does intl actually work if ICU isn't configured the first time we touch the intl object?

@devsnek
Copy link
Member

devsnek commented Sep 18, 2018

glad to see this 🎉

just so you know, we're updating the Atomics shim upstream to flip it sorta like you did here, so there might be a merge conflict there at some point.

@kfarnung
Copy link
Contributor Author

It will be a little while before this hits a nightly, but at least we should have everything ready when we are able to move to a newer version of ChakraCore.

@kfarnung
Copy link
Contributor Author

@devsnek I grabbed the current state of nodejs/node#22844 and applied that instead of my divergent change. PTAL if you have time.

@kfarnung
Copy link
Contributor Author

Since the change just landed upstream, I'll just hold off for now and rebase on top of it. Thanks for taking a look!

kfarnung added a commit to kfarnung/node-chakracore that referenced this pull request Sep 18, 2018
This reverts commit f5d29d5.

PR-URL: nodejs#600
Refs: nodejs#565
Refs: nodejs#567
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Jack Horton <Jack.Horton@microsoft.com>
This reverts commit f5d29d5.

PR-URL: nodejs#600
Refs: nodejs#565
Refs: nodejs#567
Reviewed-By: Jimmy Thomson <jithomso@microsoft.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Jack Horton <Jack.Horton@microsoft.com>
@kfarnung
Copy link
Contributor Author

@kfarnung kfarnung merged commit e198aca into nodejs:chakracore-master Sep 20, 2018
@kfarnung kfarnung deleted the icu branch September 20, 2018 22:28
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.

4 participants