Make project compilable after PurelyImplements annotation introduction

This commit is contained in:
Denis Zharkov
2015-07-02 19:28:39 +03:00
parent a218c1359f
commit 5c60a1bdb8
17 changed files with 23 additions and 22 deletions
@@ -145,8 +145,8 @@ public class FixStackAnalyzer(
private fun FixStackFrame.executeRestoreStackInTryCatch(insn: AbstractInsnNode) {
val saveNode = context.saveStackMarkerForRestoreMarker[insn]
val savedValues = savedStacks.getOrElse(saveNode) {
throw AssertionError("${indexOf(insn)}: Restore stack is unavailable for ${indexOf(saveNode!!)}")
val savedValues = savedStacks.getOrElse(saveNode!!) {
throw AssertionError("${indexOf(insn)}: Restore stack is unavailable for ${indexOf(saveNode)}")
}
pushAll(savedValues)
}
@@ -89,7 +89,7 @@ public open class JetClass : JetClassOrObject {
val parts = ArrayList<String>()
var current: JetClassOrObject? = this
while (current != null) {
parts.add(current.getName())
parts.add(current.getName()!!)
current = PsiTreeUtil.getParentOfType<JetClassOrObject>(current, javaClass<JetClassOrObject>())
}
val file = getContainingFile()
@@ -52,7 +52,7 @@ fun createSynthesizedInvokes(functions: Collection<FunctionDescriptor>): Collect
fakeOverride
}
result.add(synthesized.substitute(TypeSubstitutor.create(invoke.getDispatchReceiverParameter()!!.getType())))
result.add(synthesized.substitute(TypeSubstitutor.create(invoke.getDispatchReceiverParameter()!!.getType()))!!)
}
return result
@@ -89,10 +89,10 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
val parent = accessor.getParent() as JetProperty
val propertyDescriptor = getDescriptor(parent, resolveSession) as PropertyDescriptor
if (accessor.isGetter()) {
descriptors.add(propertyDescriptor.getGetter())
descriptors.add(propertyDescriptor.getGetter()!!)
}
else {
descriptors.add(propertyDescriptor.getSetter())
descriptors.add(propertyDescriptor.getSetter()!!)
}
accessor.acceptChildren(this)
}
@@ -108,7 +108,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
// if class has primary constructor then we visit it later, otherwise add it artificially
if (element !is JetClassOrObject || !element.hasExplicitPrimaryConstructor()) {
if (descriptor.getUnsubstitutedPrimaryConstructor() != null) {
descriptors.add(descriptor.getUnsubstitutedPrimaryConstructor())
descriptors.add(descriptor.getUnsubstitutedPrimaryConstructor()!!)
}
}
}
@@ -46,7 +46,7 @@ abstract public class AbstractFunctionDescriptorInExpressionRendererTest : Kotli
}
override fun visitFunctionLiteralExpression(expression: JetFunctionLiteralExpression) {
expression.acceptChildren(this)
descriptors.add(bindingContext.get(BindingContext.FUNCTION, expression.getFunctionLiteral()))
descriptors.add(bindingContext.get(BindingContext.FUNCTION, expression.getFunctionLiteral())!!)
}
})