Fixed partial resolve caching to cache only for statements that are guaranteed to be processed

2015-07-14 12:44:27 +03:00
parent 58f2d37d95
commit 8d1499197e
1 changed files with 5 additions and 3 deletions
@@ -66,9 +66,11 @@ public class ResolveElementCache(resolveSession: ResolveSession, private val pro

                val (bindingContext, statementFilter) = performElementAdditionalResolve(resolveElement, contextElement, BodyResolveMode.PARTIAL)

-                for (statement in (statementFilter as PartialBodyResolveFilter).allStatementsToResolve) {
-                    if (!map.containsKey(statement)) {
-                        map[statement] = bindingContext
+                if (statementFilter is PartialBodyResolveFilter) {
+                    for (statement in statementFilter.allStatementsToResolve) {
+                        if (!map.containsKey(statement) && bindingContext[BindingContext.PROCESSED, statement] == true) {
+                            map[statement] = bindingContext
+                        }
                    }
                }
                map[resolveElement] = bindingContext // we use the whole declaration key in the map to obtain resolve not inside any block (e.g. default parameter values)