From 6c9a5e6a5fa181c8416c94250c84aa06216d2004 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 11 Oct 2013 19:21:03 +0400 Subject: [PATCH] Got rid of useless trace access. --- .../jetbrains/jet/codegen/SamWrapperCodegen.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java index a68f70c9c99..a8dcece4ca7 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java @@ -25,10 +25,9 @@ import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.jet.codegen.context.CodegenContext; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; @@ -134,13 +133,9 @@ public class SamWrapperCodegen extends ParentCodegenAwareImpl { } private String getWrapperName(@NotNull JetFile containingFile) { - NamespaceDescriptor namespace = state.getBindingContext().get(BindingContext.FILE_TO_NAMESPACE, containingFile); - VirtualFile virtualFile = containingFile.getVirtualFile(); - assert namespace != null : "couldn't find namespace for file: " + virtualFile; - FqName fqName = DescriptorUtils.getFQName(namespace).toSafe(); - String packageInternalName = JvmClassName.byFqNameWithoutInnerClasses( - PackageClassUtils.getPackageClassFqName(fqName)).getInternalName(); + FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(JetPsiUtil.getFQName(containingFile)); + String packageInternalName = JvmClassName.byFqNameWithoutInnerClasses(packageClassFqName).getInternalName(); return packageInternalName + "$sam$" + samInterface.getName().asString() + "$" + - Integer.toHexString(CodegenUtil.getPathHashCode(virtualFile) * 31 + DescriptorUtils.getFQName(samInterface).hashCode()); + Integer.toHexString(CodegenUtil.getPathHashCode(containingFile.getVirtualFile()) * 31 + DescriptorUtils.getFQName(samInterface).hashCode()); } }