From 9dd27cfd1bda4eeba540ccbe17ca59a52d45e0b6 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Thu, 26 Jan 2012 02:43:39 +0200 Subject: [PATCH] fixing broken test for naming of class objects --- .../src/org/jetbrains/jet/codegen/JetTypeMapper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java index 8a29f68e249..1d8e52d7eee 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -726,6 +726,13 @@ public class JetTypeMapper { else if(container instanceof JetClass) { ClassDescriptor aClass = bindingContext.get(BindingContext.CLASS, container); baseName = mapType(aClass.getDefaultType(), OwnerKind.IMPLEMENTATION).getInternalName(); + + ClassDescriptor myClass = bindingContext.get(BindingContext.CLASS, expression); + if(CodegenUtil.isClassObject(myClass)) { + return mapType(aClass.getDefaultType(), OwnerKind.IMPLEMENTATION).getInternalName() + "$ClassObject$"; + } + else + baseName = classNameForAnonymousClass((JetElement) container); } else { baseName = classNameForAnonymousClass((JetElement) container);