Locate the classes directory in zinc in order to relativize classnames #7853
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
blorente
approved these changes
Jun 5, 2019
| ) yield { | ||
| // strongly hold the classNames, and transform them to ensure that they are unlinked from | ||
| // the remainder of the analysis | ||
| val classNames = analysis.relations.srcProd.reverseMap.keys.toList.toSet.map( |
There was a problem hiding this comment.
I'm going to assume that this long chain worked before :)
Feel free to ask for review again if I shouldn't.
There was a problem hiding this comment.
Yea, that's... relatively trustworthy.
| val analysisDefinesClass = | ||
| for ( | ||
| abstractAnalysis <- getAnalysis(classpathEntry); | ||
| analysis = abstractAnalysis.asInstanceOf[Analysis]; |
There was a problem hiding this comment.
Yes, in practice.
| abstractAnalysis <- getAnalysis(classpathEntry); | ||
| analysis = abstractAnalysis.asInstanceOf[Analysis]; | ||
| compilation <- analysis.compilations.allCompilations.headOption; | ||
| singleOutput <- compilation.getOutput.getSingleOutput.asScala; |
There was a problem hiding this comment.
is this getSingleOutput always single? I think so because we're only asking for the analysis of one file, but still I want to make sure.
There was a problem hiding this comment.
Yea, this is effectively a dead API in zinc.
| new ClassNamesDefinesClass(classNames) | ||
| }.getOrElse { | ||
| // If we have analysis with a valid Compilation, use the classnames it refers to. | ||
| val analysisDefinesClass = |
There was a problem hiding this comment.
Could be worth annotating this with a type, it took me a while to determine that this for comprehension was single-element (an Option) and not an iterator.
stuhood
added a commit
that referenced
this pull request
Jun 6, 2019
stuhood
added a commit
that referenced
this pull request
Jun 7, 2019
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.
Problem
As described in #7850:
zinccurrently makes assumptions about directory layouts that aren't valid when it is being invoked viarsc.Solution
Rather than attempting to recognize patterns, get the output directory of the compile to use for relativization.
Result
A followup PR will be able to confirm that
dep-usage.jvmworks underrsc.