azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not inject TopDownAnalysisParameters into OverrideResolver

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-23 12:52:45 +04:00
parent d4a6374d76
commit 153d8c2a52
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
-1
View File
@@ -280,7 +280,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
overloadResolver.setTrace(bindingTrace);
overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
overrideResolver.setTrace(bindingTrace);
typeHierarchyResolver.setDescriptorResolver(descriptorResolver);
compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java
-1
View File
@@ -235,7 +235,6 @@ public class InjectorForTopDownAnalyzerBasic {
overloadResolver.setTrace(bindingTrace);
overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
overrideResolver.setTrace(bindingTrace);
typeHierarchyResolver.setDescriptorResolver(descriptorResolver);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+3 -9
View File
@@ -48,14 +48,8 @@ import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilit
public class OverrideResolver {
private TopDownAnalysisParameters topDownAnalysisParameters;
private BindingTrace trace;
@Inject
public void setTopDownAnalysisParameters(TopDownAnalysisParameters topDownAnalysisParameters) {
this.topDownAnalysisParameters = topDownAnalysisParameters;
}
@Inject
public void setTrace(BindingTrace trace) {
this.trace = trace;
@@ -211,12 +205,12 @@ public class OverrideResolver {
private void checkOverrides(@NotNull TopDownAnalysisContext c) {
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
checkOverridesInAClass((MutableClassDescriptor) entry.getValue(), entry.getKey());
checkOverridesInAClass(c, (MutableClassDescriptor) entry.getValue(), entry.getKey());
}
}
private void checkOverridesInAClass(@NotNull MutableClassDescriptor classDescriptor, @NotNull JetClassOrObject klass) {
if (topDownAnalysisParameters.isAnalyzingBootstrapLibrary()) return;
private void checkOverridesInAClass(@NotNull TopDownAnalysisContext c, @NotNull MutableClassDescriptor classDescriptor, @NotNull JetClassOrObject klass) {
if (c.getTopDownAnalysisParameters().isAnalyzingBootstrapLibrary()) return;
// Check overrides for internal consistency
for (CallableMemberDescriptor member : classDescriptor.getDeclaredCallableMembers()) {
js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java
-1
View File
@@ -235,7 +235,6 @@ public class InjectorForTopDownAnalyzerForJs {
overloadResolver.setTrace(bindingTrace);
overrideResolver.setTopDownAnalysisParameters(topDownAnalysisParameters);
overrideResolver.setTrace(bindingTrace);
typeHierarchyResolver.setDescriptorResolver(descriptorResolver);