-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update parameter names in test data after ASM update
This is mostly a revert of the following commits: 1) 63ca8eb 2) eb32273 These commits were made to update intellij dependency (KTI-1416). However, it seems that during that update, the asm dependency was not updated. This led to a situation where the Kotlin compiler used intellij with a fix for IDEA-331588: JetBrains/intellij-community@638600f But with an older ASM version that did not yet have `ClassReader.VISIT_LOCAL_VARIABLES` and the corresponding code to handle it. Normally this would result in a NoSuchFieldError at runtime. However the referenced field here is public static final, so it was inlined at the call site, and everything worked as before, except the fact that `ClsFileImpl` now passed `SKIP_CODE` (along with a value of `VISIT_LOCAL_VARIABLES` = 256, which had no effect), which resulted in parameter names of Java methods not being loaded. Now that ASM is updated to a new version, `VISIT_LOCAL_VARIABLES` started working as expected, and parameter names are loaded again. Note that in most tests parameter names have been updated, but in some diagnostic tests AA versions of tests have been muted, because behavior differs between the compiler and AA modes (AA always uses compiled PSI). #KT-74276 Fixed
- Loading branch information
Showing
51 changed files
with
570 additions
and
567 deletions.
There are no files selected for viewing
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
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
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
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
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
2 changes: 1 addition & 1 deletion
2
...alysis-api/testData/components/resolver/singleByPsi/SamAdapter.descriptors.references.txt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
KtNameReferenceExpression(35,46): 'invokeLater' | ||
KtSimpleNameReference: | ||
(in javax.swing.SwingUtilities) open fun invokeLater(p0: java.lang.Runnable!) | ||
(in javax.swing.SwingUtilities) open fun invokeLater(doRun: java.lang.Runnable!) | ||
|
||
SyntheticPropertyAccessorReference: | ||
Nothing (Unresolved reference) |
2 changes: 1 addition & 1 deletion
2
analysis/analysis-api/testData/components/resolver/singleByPsi/SamAdapter.references.txt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
KtNameReferenceExpression(35,46): 'invokeLater' | ||
KtSimpleNameReference: | ||
(in javax.swing.SwingUtilities) open fun invokeLater(p0: java.lang.Runnable!) | ||
(in javax.swing.SwingUtilities) open fun invokeLater(doRun: java.lang.Runnable!) |
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
Oops, something went wrong.