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

Assertions and a possible fix for EA-34423 - NPE: GenerationState.compileCorrectFiles

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-12 16:42:10 +04:00
parent 897242458b
commit 00142a7775
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
+5 -2
View File
@@ -22,6 +22,7 @@ package org.jetbrains.jet.codegen;
import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.Stack; import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
@@ -132,17 +133,19 @@ public class GenerationState {
compileCorrectFiles(bindingContext, files, CompilationErrorHandler.THROW_EXCEPTION, annotate); compileCorrectFiles(bindingContext, files, CompilationErrorHandler.THROW_EXCEPTION, annotate);
} }
public void compileCorrectFiles(BindingContext bindingContext, List<JetFile> files, CompilationErrorHandler errorHandler, boolean annotate) { public void compileCorrectFiles(BindingContext bindingContext, List<JetFile> files, @NotNull CompilationErrorHandler errorHandler, boolean annotate) {
ClosureAnnotator closureAnnotator = !annotate ? null : new ClosureAnnotator(bindingContext, files); ClosureAnnotator closureAnnotator = !annotate ? null : new ClosureAnnotator(bindingContext, files);
typeMapper = new JetTypeMapper(standardLibrary, bindingContext, closureAnnotator); typeMapper = new JetTypeMapper(standardLibrary, bindingContext, closureAnnotator);
bindingContexts.push(bindingContext); bindingContexts.push(bindingContext);
try { try {
for (JetFile namespace : files) { for (JetFile namespace : files) {
if (namespace == null) throw new IllegalArgumentException("A null file given for compilation");
try { try {
generateNamespace(namespace); generateNamespace(namespace);
} }
catch (Throwable e) { catch (Throwable e) {
errorHandler.reportException(e, namespace.getContainingFile().getVirtualFile().getUrl()); VirtualFile virtualFile = namespace.getContainingFile().getVirtualFile();
errorHandler.reportException(e, virtualFile == null ? "no file" : virtualFile.getUrl());
DiagnosticUtils.throwIfRunningOnServer(e); DiagnosticUtils.throwIfRunningOnServer(e);
if (ApplicationManager.getApplication().isInternal()) { if (ApplicationManager.getApplication().isInternal()) {
e.printStackTrace(); e.printStackTrace();