Skip to content
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

sync #44

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

sync #44

wants to merge 10 commits into from

Conversation

phoddie
Copy link
Collaborator

@phoddie phoddie commented Jul 21, 2023

No description provided.

Copy link
Contributor

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

Thanks for these update.

We're now using an Agoric branch as our main, but I think it'd be a good idea to keep using the master branch to track your upstream changes. That said, to ease the integration into our Agoric branch, I would like to merged these commits from the master branch incrementally. However right now I couldn't do this because some bug fixes and improvements I'd want to include first are layered after the new feature enablements that were added more recently and that we haven't been able to upgrade to yet.

Is there any chance you could interactive rebase these to re-order them? In particular could you move the commits named "canonical NaN and keys garbage colleciton" at the end, maybe with "fxUseSnapshot" just before them?

@@ -31,7 +31,6 @@ C_OPTIONS = \
-DmxLockdown=1 \
-DmxMetering=1 \
-DmxDebug=1 \
-UmxInstrument \
Copy link
Contributor

Choose a reason for hiding this comment

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

Commit says "mxInstrument must be undefined to disable", but isn't that what -U makes explicit?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I just misread the -U as another -D.

xsnap/sources/xsnap-worker.c Show resolved Hide resolved
@phoddie
Copy link
Collaborator Author

phoddie commented Jul 21, 2023

Is there any chance you could interactive rebase these to re-order them? In particular could you move the commits named "canonical NaN and keys garbage colleciton" at the end, maybe with "fxUseSnapshot" just before them?

That likely exceeds my git skills. I don't want to make a mess of things. If you can to provide the command(s) to get the result you want, I can try that.

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.

2 participants