Fix Issue 20518 - simple import ICE regression #10736
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
|
Thanks for your pull request and interest in making D better, @BorisCarvajal! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please see CONTRIBUTING.md for more information. If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment. Bugzilla references
Testing this PR locallyIf you don't have a local development environment setup, you can use Digger to test this PR: dub fetch digger
dub run digger -- build "stable + dmd#10736" |
| @@ -160,15 +160,22 @@ extern (C++) final class Import : Dsymbol | |||
| { | |||
| if (p.isPkgMod == PKG.unknown) | |||
| { | |||
| uint preverrors = global.errors; | |||
| mod = Module.load(loc, packages, id); | |||
| if (!mod) | |||
| p.isPkgMod = PKG.package_; | |||
| else | |||
| { | |||
| // mod is a package.d, or a normal module which conflicts with the package name. | |||
There was a problem hiding this comment.
Does this comment still apply?
There was a problem hiding this comment.
I think yes, the first part is the true and the following is the error.
thewilsonator
approved these changes
Jan 19, 2020
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.
The assert was obsolete even p.isPkgMod doesn't change at all in that block.