From 889a238fbc8bdcf8c8d40d649f215a5da25a7589 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 3 Oct 2012 22:55:30 +0400 Subject: [PATCH] KT-1973 Made classes for objects declarations/expressions final. #KT-1973 in progress --- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 2fea14037c3..47a94a62d46 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -124,8 +124,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { isFinal = true; } } - else if (myClass.getParent() instanceof JetClassObject) { - isStatic = true; + else { + isStatic = myClass.getParent() instanceof JetClassObject; + isFinal = true; } int access = 0;