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

The slow (synchronized) java.util.Stack replaced by com.intellij.util.containers.Stack

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-18 14:42:45 +04:00
parent 2c3a955074
commit 380c8b596a
12 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+1
View File
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.Function;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.Label;
compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java
+2 -1
View File
@@ -34,7 +34,8 @@ import org.jetbrains.jet.rt.signature.JetSignatureWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
import com.intellij.util.containers.Stack;
public class BothSignatureWriter {
compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java
+1
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.diagnostics.AbstractDiagnosticFactory;
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+5 -1
View File
@@ -16,12 +16,16 @@
package org.jetbrains.jet.lang.cfg.pseudocode;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.cfg.*;
import org.jetbrains.jet.lang.psi.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAdapter {
compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
+2 -1
View File
@@ -25,7 +25,8 @@ import org.jetbrains.jet.lexer.JetTokens;
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
import com.intellij.util.containers.Stack;
import static org.jetbrains.jet.lexer.JetTokens.*;
compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.jet.lexer.JetTokens;
import java.util.Stack;
import com.intellij.util.containers.Stack;
import static org.jetbrains.jet.lexer.JetTokens.*;
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java
+7 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.types.expressions;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
@@ -25,9 +26,13 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import java.util.*;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.LABEL_NAME_CLASH;
import static org.jetbrains.jet.lang.diagnostics.Errors.UNRESOLVED_REFERENCE;
import static org.jetbrains.jet.lang.resolve.BindingContext.LABEL_TARGET;
import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET;
compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex
+1
View File
@@ -4,6 +4,7 @@ import java.util.*;
import com.intellij.lexer.*;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.containers.Stack;
import org.jetbrains.jet.lexer.JetTokens;
compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java
+4 -3
View File
@@ -1,4 +1,4 @@
/* The following code was generated by JFlex 1.4.3 on 5/29/12 11:33 AM */
/* The following code was generated by JFlex 1.4.3 on 12/18/12 2:41 PM */
package org.jetbrains.jet.lexer;
@@ -6,6 +6,7 @@ import java.util.*;
import com.intellij.lexer.*;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.containers.Stack;
import org.jetbrains.jet.lexer.JetTokens;
@@ -13,8 +14,8 @@ import org.jetbrains.jet.lexer.JetTokens;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 5/29/12 11:33 AM from the specification file
* <tt>/Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
* on 12/18/12 2:41 PM from the specification file
* <tt>/Volumes/WD600/work/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
*/
class _JetLexer implements FlexLexer {
/** initial size of the lookahead buffer */
compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
+5 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.codegen.forTestCompile;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.common.ExitCode;
@@ -27,7 +28,10 @@ import javax.tools.*;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
/**
* Compile stdlib.jar that can be used in tests
compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileSomething.java
+2 -1
View File
@@ -27,7 +27,8 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Stack;
import com.intellij.util.containers.Stack;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerOutputParser.java
+1 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.compiler.runner;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.cli.common.messages.*;
@@ -31,7 +32,6 @@ import javax.xml.parsers.SAXParserFactory;
import java.io.IOException;
import java.io.Reader;
import java.util.Map;
import java.util.Stack;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*;