Fix compile from interpreter context #2071
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YieldFinishedCompile.cs * Previously we switched to the program context every time a program compiled, which cause an issue with an empty program context if called from the interpreter. * Added a check for FILE CompileMode before switching contexts
Dunbaratu
approved these changes
Jul 21, 2017
| @@ -40,7 +40,8 @@ private YieldFinishedCompile(GlobalPath scriptPath, int lineNumber, string fileC | |||
|
|
|||
| public override void ThreadInitialize(SafeSharedObjects shared) | |||
| { | |||
| programContext = shared.Cpu.SwitchToProgramContext(); | |||
| if (compileMode != CompileMode.FILE) | |||
| programContext = shared.Cpu.SwitchToProgramContext(); // only switch the context if executing | |||
There was a problem hiding this comment.
This was a good catch. Yup, this is exactly what was the problem. This tries to run the program... that isn't being made.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2069
YieldFinishedCompile.cs
compiled, which cause an issue with an empty program context if called
from the interpreter.