azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepend zeros to SAM wrapper hash code

Browse Source 
To make its length always 8 characters as is already done for package parts.
This fixes some test on incremental compilation because it relies that hashes
are eight characters long
This commit is contained in:
Alexander Udalov
2014-11-11 19:57:33 +03:00
parent 83a2111057
commit b39d34ca8d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java
+8 -5
View File
@@ -171,11 +171,14 @@ public class SamWrapperCodegen {
private FqName getWrapperName(@NotNull JetFile containingFile) { private FqName getWrapperName(@NotNull JetFile containingFile) {
FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(containingFile.getPackageFqName()); FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(containingFile.getPackageFqName());
JavaClassDescriptor descriptor = samType.getJavaClassDescriptor(); JavaClassDescriptor descriptor = samType.getJavaClassDescriptor();
String shortName = packageClassFqName.shortName().asString() + "$sam$" + descriptor.getName().asString() + "$" + int hash = PackagePartClassUtils.getPathHashCode(containingFile.getVirtualFile()) * 31 +
Integer.toHexString( DescriptorUtils.getFqNameSafe(descriptor).hashCode();
PackagePartClassUtils.getPathHashCode(containingFile.getVirtualFile()) * 31 + String shortName = String.format(
DescriptorUtils.getFqNameSafe(descriptor).hashCode() "%s$sam$%s$%08x",
); packageClassFqName.shortName().asString(),
descriptor.getName().asString(),
hash
);
return packageClassFqName.parent().child(Name.identifier(shortName)); return packageClassFqName.parent().child(Name.identifier(shortName));
} }
} }