[ecj] 01/08: Merge tag 'upstream/3.10.0'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jun 26 15:47:48 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 140bdbcf90fe9d92753baf5cc4c5fbccba1999d2
Merge: edc5b2b 73f0c2e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 26 16:42:54 2014 +0200

    Merge tag 'upstream/3.10.0'
    
    Upstream version 3.10.0

 src/org.eclipse.jdt.core/build.xml                 |   21 +-
 .../org/eclipse/jdt/core/JDTCompilerAdapter.java   |   15 +-
 .../org/eclipse/jdt/core/compiler/IProblem.java    |  286 +-
 .../eclipse/jdt/internal/compiler/ASTVisitor.java  |   84 +-
 .../eclipse/jdt/internal/compiler/ClassFile.java   | 1291 ++++++++-
 .../jdt/internal/compiler/CompilationResult.java   |    4 +-
 .../eclipse/jdt/internal/compiler/Compiler.java    |   25 +-
 .../compiler/DefaultErrorHandlingPolicies.java     |   31 +-
 .../internal/compiler/IErrorHandlingPolicy.java    |    6 +-
 .../eclipse/jdt/internal/compiler/ReadManager.java |    5 +-
 .../internal/compiler/ast/AND_AND_Expression.java  |    3 +-
 .../eclipse/jdt/internal/compiler/ast/ASTNode.java |  482 +++-
 .../compiler/ast/AbstractMethodDeclaration.java    |  186 +-
 .../compiler/ast/AbstractVariableDeclaration.java  |   16 +-
 .../compiler/ast/AllocationExpression.java         |  354 ++-
 .../jdt/internal/compiler/ast/Annotation.java      |  809 +++++-
 .../compiler/ast/AnnotationMethodDeclaration.java  |    7 +-
 .../jdt/internal/compiler/ast/Argument.java        |   63 +-
 .../compiler/ast/ArrayAllocationExpression.java    |   65 +-
 .../internal/compiler/ast/ArrayInitializer.java    |   29 +-
 .../compiler/ast/ArrayQualifiedTypeReference.java  |   97 +-
 .../jdt/internal/compiler/ast/ArrayReference.java  |   24 +-
 .../internal/compiler/ast/ArrayTypeReference.java  |   98 +-
 .../jdt/internal/compiler/ast/Assignment.java      |   25 +-
 .../internal/compiler/ast/BinaryExpression.java    |    8 +-
 .../eclipse/jdt/internal/compiler/ast/Block.java   |    5 +
 .../jdt/internal/compiler/ast/CastExpression.java  |  101 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |   37 +-
 .../internal/compiler/ast/CompoundAssignment.java  |    8 +-
 .../compiler/ast/ConditionalExpression.java        |  321 ++-
 .../compiler/ast/ConstructorDeclaration.java       |   31 +-
 .../internal/compiler/ast/ContainerAnnotation.java |   88 +
 .../jdt/internal/compiler/ast/EqualExpression.java |   16 +-
 .../compiler/ast/ExplicitConstructorCall.java      |  101 +-
 .../jdt/internal/compiler/ast/Expression.java      |  169 +-
 .../internal/compiler/ast/ExpressionContext.java   |   73 +
 .../compiler/ast/FakedTrackingVariable.java        |  113 +-
 .../internal/compiler/ast/FieldDeclaration.java    |   47 +-
 .../jdt/internal/compiler/ast/FieldReference.java  |   30 +-
 .../internal/compiler/ast/ForeachStatement.java    |   14 +-
 .../compiler/ast/FunctionalExpression.java         |  358 +++
 .../jdt/internal/compiler/ast/Initializer.java     |    8 +-
 .../compiler/ast/InnerInferenceHelper.java         |   42 +
 .../compiler/ast/InstanceOfExpression.java         |   14 +-
 .../ast/IntersectionCastTypeReference.java         |  201 ++
 .../jdt/internal/compiler/ast/Invocation.java      |   89 +
 .../eclipse/jdt/internal/compiler/ast/Javadoc.java |   34 +-
 .../compiler/ast/JavadocAllocationExpression.java  |    4 +-
 .../compiler/ast/JavadocImplicitTypeReference.java |   12 +-
 .../internal/compiler/ast/JavadocMessageSend.java  |    2 +-
 .../ast/JavadocQualifiedTypeReference.java         |    8 +-
 .../compiler/ast/JavadocSingleTypeReference.java   |    6 +-
 .../internal/compiler/ast/LambdaExpression.java    | 1275 +++++++++
 .../internal/compiler/ast/LocalDeclaration.java    |   69 +-
 .../internal/compiler/ast/MarkerAnnotation.java    |   10 +-
 .../jdt/internal/compiler/ast/MemberValuePair.java |   63 +-
 .../jdt/internal/compiler/ast/MessageSend.java     |  336 ++-
 .../internal/compiler/ast/MethodDeclaration.java   |   51 +-
 .../jdt/internal/compiler/ast/NameReference.java   |   24 +
 .../internal/compiler/ast/NormalAnnotation.java    |   15 +-
 .../compiler/ast/NullAnnotationMatching.java       |  462 ++++
 .../internal/compiler/ast/OR_OR_Expression.java    |    3 +-
 .../internal/compiler/ast/OperatorExpression.java  |    8 +-
 .../ast/ParameterizedQualifiedTypeReference.java   |  130 +-
 .../ast/ParameterizedSingleTypeReference.java      |  145 +-
 .../ast/QualifiedAllocationExpression.java         |   49 +-
 .../compiler/ast/QualifiedNameReference.java       |   65 +-
 .../compiler/ast/QualifiedSuperReference.java      |   47 +-
 .../compiler/ast/QualifiedThisReference.java       |   45 +-
 .../compiler/ast/QualifiedTypeReference.java       |   79 +-
 .../jdt/internal/compiler/ast/Receiver.java        |   40 +
 .../jdt/internal/compiler/ast/Reference.java       |   17 +-
 .../internal/compiler/ast/ReferenceExpression.java |  851 ++++++
 .../jdt/internal/compiler/ast/ReturnStatement.java |  102 +-
 .../compiler/ast/SingleMemberAnnotation.java       |   20 +-
 .../internal/compiler/ast/SingleNameReference.java |   67 +-
 .../internal/compiler/ast/SingleTypeReference.java |   52 +-
 .../jdt/internal/compiler/ast/Statement.java       |  189 +-
 .../jdt/internal/compiler/ast/SuperReference.java  |   11 +-
 .../jdt/internal/compiler/ast/SwitchStatement.java |    6 +-
 .../jdt/internal/compiler/ast/ThisReference.java   |   31 +-
 .../jdt/internal/compiler/ast/ThrowStatement.java  |    4 +-
 .../jdt/internal/compiler/ast/TryStatement.java    |   12 +-
 .../jdt/internal/compiler/ast/TypeDeclaration.java |   54 +-
 .../jdt/internal/compiler/ast/TypeParameter.java   |   78 +-
 .../jdt/internal/compiler/ast/TypeReference.java   |  496 +++-
 .../internal/compiler/ast/UnionTypeReference.java  |   21 +-
 .../jdt/internal/compiler/ast/Wildcard.java        |   58 +-
 .../compiler/batch/ClasspathDirectory.java         |    3 +-
 .../jdt/internal/compiler/batch/ClasspathJar.java  |    3 +-
 .../jdt/internal/compiler/batch/FileFinder.java    |    3 +-
 .../jdt/internal/compiler/batch/FileSystem.java    |    3 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  |   72 +-
 .../internal/compiler/batch/messages.properties    |   15 +-
 .../compiler/classfmt/ClassFileConstants.java      |   36 +-
 .../compiler/classfmt/ClassFileReader.java         |   40 +-
 .../jdt/internal/compiler/classfmt/FieldInfo.java  |  128 +-
 .../compiler/classfmt/FieldInfoWithAnnotation.java |   11 +-
 .../classfmt/FieldInfoWithTypeAnnotation.java      |   50 +
 .../jdt/internal/compiler/classfmt/MethodInfo.java |   76 +-
 .../MethodInfoWithParameterAnnotations.java        |    2 +-
 .../classfmt/MethodInfoWithTypeAnnotations.java    |   47 +
 .../NonNullDefaultAwareTypeAnnotationWalker.java   |  151 ++
 .../compiler/classfmt/TypeAnnotationInfo.java      |  238 ++
 .../compiler/classfmt/TypeAnnotationWalker.java    |  320 +++
 .../compiler/codegen/AnnotationContext.java        |   56 +
 .../codegen/AnnotationTargetTypeConstants.java     |   52 +
 .../compiler/codegen/AttributeNamesConstants.java  |   13 +-
 .../jdt/internal/compiler/codegen/CodeStream.java  |  490 +++-
 .../internal/compiler/codegen/ConstantPool.java    |  102 +-
 .../internal/compiler/codegen/ExceptionLabel.java  |   15 +-
 .../compiler/codegen/MultiCatchExceptionLabel.java |   12 +-
 .../jdt/internal/compiler/codegen/Opcodes.java     |    6 +-
 .../internal/compiler/codegen/StackMapFrame.java   |    2 +-
 .../compiler/codegen/StackMapFrameCodeStream.java  |    3 +-
 .../compiler/codegen/TypeAnnotationCodeStream.java |  152 ++
 .../jdt/internal/compiler/env/IBinaryField.java    |    9 +-
 .../jdt/internal/compiler/env/IBinaryMethod.java   |    9 +-
 .../jdt/internal/compiler/env/IBinaryType.java     |   11 +-
 .../compiler/env/IBinaryTypeAnnotation.java        |   74 +
 .../jdt/internal/compiler/env/ISourceType.java     |    5 +
 .../flow/ExceptionHandlingFlowContext.java         |    5 +-
 .../internal/compiler/flow/FinallyFlowContext.java |   14 +-
 .../jdt/internal/compiler/flow/FlowContext.java    |    8 +-
 .../jdt/internal/compiler/flow/FlowInfo.java       |   25 +-
 .../internal/compiler/flow/LoopingFlowContext.java |   18 +-
 .../compiler/flow/UnconditionalFlowInfo.java       |   16 +
 .../internal/compiler/impl/CompilerOptions.java    |   72 +-
 .../jdt/internal/compiler/impl/CompilerStats.java  |    3 +-
 .../internal/compiler/impl/ReferenceContext.java   |    6 +-
 .../compiler/lookup/AnnotatableTypeSystem.java     |  416 +++
 .../compiler/lookup/AnnotationBinding.java         |   84 +-
 .../internal/compiler/lookup/AnnotationHolder.java |    3 +-
 .../jdt/internal/compiler/lookup/ArrayBinding.java |  208 +-
 .../internal/compiler/lookup/BaseTypeBinding.java  |   47 +-
 .../compiler/lookup/BinaryTypeBinding.java         |  624 ++++-
 .../jdt/internal/compiler/lookup/Binding.java      |   77 +-
 .../jdt/internal/compiler/lookup/BlockScope.java   |  163 +-
 .../jdt/internal/compiler/lookup/BoundSet.java     |  987 +++++++
 .../internal/compiler/lookup/CaptureBinding.java   |  149 +-
 .../internal/compiler/lookup/CaptureBinding18.java |  335 +++
 .../compiler/lookup/CatchParameterBinding.java     |    9 +-
 .../jdt/internal/compiler/lookup/ClassScope.java   |  129 +-
 .../compiler/lookup/CompilationUnitScope.java      |   87 +-
 .../lookup/ConstraintExceptionFormula.java         |  160 ++
 .../lookup/ConstraintExpressionFormula.java        |  485 ++++
 .../compiler/lookup/ConstraintFormula.java         |   83 +
 .../compiler/lookup/ConstraintTypeFormula.java     |  396 +++
 .../internal/compiler/lookup/ElementValuePair.java |   38 +-
 .../compiler/lookup/ExtraCompilerModifiers.java    |   16 +-
 .../jdt/internal/compiler/lookup/FieldBinding.java |   25 +-
 .../lookup/ImplicitNullAnnotationVerifier.java     |  184 +-
 .../internal/compiler/lookup/InferenceContext.java |    2 +-
 .../compiler/lookup/InferenceContext18.java        | 1694 ++++++++++++
 .../compiler/lookup/InferenceFailureException.java |   26 +
 .../compiler/lookup/InferenceSubstitution.java     |   97 +
 .../compiler/lookup/InferenceVariable.java         |  121 +
 .../lookup/IntersectionCastTypeBinding.java        |  278 ++
 .../internal/compiler/lookup/InvocationSite.java   |   13 +-
 .../internal/compiler/lookup/LocalTypeBinding.java |   93 +-
 .../compiler/lookup/LocalVariableBinding.java      |   30 +-
 .../compiler/lookup/LookupEnvironment.java         |  552 ++--
 .../compiler/lookup/MemberTypeBinding.java         |   32 +-
 .../internal/compiler/lookup/MethodBinding.java    |  175 +-
 .../jdt/internal/compiler/lookup/MethodScope.java  |  122 +-
 .../internal/compiler/lookup/MethodVerifier.java   |  234 +-
 .../internal/compiler/lookup/MethodVerifier15.java |  354 ++-
 .../compiler/lookup/MissingTypeBinding.java        |   11 +-
 .../lookup/MostSpecificExceptionMethodBinding.java |    7 +-
 .../compiler/lookup/NestedTypeBinding.java         |   45 +-
 .../internal/compiler/lookup/NullTypeBinding.java  |   31 +
 .../internal/compiler/lookup/PackageBinding.java   |    8 +-
 .../lookup/ParameterizedGenericMethodBinding.java  |  255 +-
 .../lookup/ParameterizedMethodBinding.java         |   83 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |  448 +++-
 .../internal/compiler/lookup/PolyTypeBinding.java  |   75 +
 .../compiler/lookup/PolymorphicMethodBinding.java  |    4 +-
 .../compiler/lookup/ProblemMethodBinding.java      |   11 +-
 .../internal/compiler/lookup/ProblemReasons.java   |   17 +-
 .../compiler/lookup/ProblemReferenceBinding.java   |   13 +-
 .../internal/compiler/lookup/RawTypeBinding.java   |   70 +-
 .../internal/compiler/lookup/ReductionResult.java  |   57 +
 .../internal/compiler/lookup/ReferenceBinding.java |  550 +++-
 .../jdt/internal/compiler/lookup/Scope.java        | 1742 ++++++++----
 .../compiler/lookup/SourceTypeBinding.java         |  736 ++++-
 .../lookup/SyntheticFactoryMethodBinding.java      |   42 +
 .../compiler/lookup/SyntheticMethodBinding.java    |  107 +-
 .../jdt/internal/compiler/lookup/TagBits.java      |   39 +-
 .../jdt/internal/compiler/lookup/TypeBinding.java  |  555 +++-
 .../compiler/lookup/TypeBindingVisitor.java        |  143 +
 .../jdt/internal/compiler/lookup/TypeBound.java    |   83 +
 .../internal/compiler/lookup/TypeConstants.java    |   67 +-
 .../jdt/internal/compiler/lookup/TypeIds.java      |   15 +-
 .../jdt/internal/compiler/lookup/TypeSystem.java   |  379 +++
 .../compiler/lookup/TypeVariableBinding.java       |  423 ++-
 .../lookup/UnresolvedAnnotationBinding.java        |    7 +-
 .../lookup/UnresolvedReferenceBinding.java         |   74 +-
 .../internal/compiler/lookup/VariableBinding.java  |   17 +-
 .../internal/compiler/lookup/VoidTypeBinding.java  |   31 +
 .../internal/compiler/lookup/WildcardBinding.java  |  248 +-
 .../compiler/parser/AbstractCommentParser.java     |    3 +-
 .../compiler/parser/CommitRollbackParser.java      |  106 +
 ...BasicInformation.java => ConflictedParser.java} |   30 +-
 .../compiler/parser/JavadocTagConstants.java       |    6 +-
 .../jdt/internal/compiler/parser/Parser.java       | 2807 +++++++++++++++-----
 .../compiler/parser/ParserBasicInformation.java    |   34 +-
 .../internal/compiler/parser/RecoveredBlock.java   |   23 +-
 .../internal/compiler/parser/RecoveredElement.java |    5 +-
 .../internal/compiler/parser/RecoveredField.java   |    3 +-
 .../compiler/parser/RecoveredLocalVariable.java    |    4 +-
 .../internal/compiler/parser/RecoveredMethod.java  |   11 +-
 .../compiler/parser/RecoveredStatement.java        |    7 +-
 .../internal/compiler/parser/RecoveredType.java    |    9 +-
 .../internal/compiler/parser/RecoveredUnit.java    |    3 +-
 .../internal/compiler/parser/RecoveryScanner.java  |    8 +-
 .../jdt/internal/compiler/parser/Scanner.java      |  478 +++-
 .../internal/compiler/parser/ScannerHelper.java    |  170 +-
 .../internal/compiler/parser/TerminalTokens.java   |  208 +-
 .../compiler/parser/diagnose/DiagnoseParser.java   |   38 +-
 .../compiler/parser/diagnose/LexStream.java        |   14 +-
 .../jdt/internal/compiler/parser/parser1.rsc       |  Bin 24970 -> 32238 bytes
 .../jdt/internal/compiler/parser/parser10.rsc      |  Bin 276 -> 566 bytes
 .../jdt/internal/compiler/parser/parser11.rsc      |  Bin 276 -> 566 bytes
 .../jdt/internal/compiler/parser/parser12.rsc      |  Bin 276 -> 566 bytes
 .../jdt/internal/compiler/parser/parser13.rsc      |  Bin 276 -> 566 bytes
 .../jdt/internal/compiler/parser/parser14.rsc      |  Bin 1270 -> 2274 bytes
 .../jdt/internal/compiler/parser/parser15.rsc      |  Bin 992 -> 1446 bytes
 .../jdt/internal/compiler/parser/parser16.rsc      |  Bin 2018 -> 2186 bytes
 .../jdt/internal/compiler/parser/parser17.rsc      |  Bin 724 -> 797 bytes
 .../jdt/internal/compiler/parser/parser18.rsc      |  Bin 8254 -> 7747 bytes
 .../jdt/internal/compiler/parser/parser19.rsc      |   13 +-
 .../jdt/internal/compiler/parser/parser2.rsc       |  Bin 23522 -> 30644 bytes
 .../jdt/internal/compiler/parser/parser20.rsc      |  Bin 13600 -> 15356 bytes
 .../jdt/internal/compiler/parser/parser21.rsc      |  Bin 5792 -> 6376 bytes
 .../jdt/internal/compiler/parser/parser22.rsc      |  Bin 650 -> 720 bytes
 .../jdt/internal/compiler/parser/parser23.rsc      |  Bin 74 -> 90 bytes
 .../jdt/internal/compiler/parser/parser24.rsc      |  Bin 650 -> 720 bytes
 .../jdt/internal/compiler/parser/parser3.rsc       |  Bin 2018 -> 2186 bytes
 .../jdt/internal/compiler/parser/parser4.rsc       |  Bin 3454 -> 3178 bytes
 .../jdt/internal/compiler/parser/parser5.rsc       |  Bin 2018 -> 2186 bytes
 .../jdt/internal/compiler/parser/parser6.rsc       |  Bin 1040 -> 1270 bytes
 .../jdt/internal/compiler/parser/parser7.rsc       |  Bin 222 -> 238 bytes
 .../jdt/internal/compiler/parser/parser8.rsc       |  Bin 650 -> 720 bytes
 .../jdt/internal/compiler/parser/parser9.rsc       |  Bin 16368 -> 15408 bytes
 .../internal/compiler/parser/readableNames.props   |   35 +
 .../internal/compiler/parser/unicode6_2/part0.rsc  |  Bin 0 -> 8192 bytes
 .../parser/{parser21.rsc => unicode6_2/part1.rsc}  |  Bin 5792 -> 8192 bytes
 .../parser/{parser21.rsc => unicode6_2/part14.rsc} |  Bin 5792 -> 8192 bytes
 .../internal/compiler/parser/unicode6_2/part2.rsc  |  Bin 0 -> 8192 bytes
 .../internal/compiler/parser/unicode6_2/start0.rsc |  Bin 0 -> 8192 bytes
 .../parser/{parser21.rsc => unicode6_2/start1.rsc} |  Bin 5792 -> 8192 bytes
 .../internal/compiler/parser/unicode6_2/start2.rsc |  Bin 0 -> 8192 bytes
 .../compiler/problem/DefaultProblemFactory.java    |    3 +-
 .../internal/compiler/problem/ProblemHandler.java  |   23 +-
 .../internal/compiler/problem/ProblemReporter.java | 1580 ++++++++++-
 .../compiler/problem/ProblemSeverities.java        |    5 +-
 .../internal/compiler/problem/messages.properties  |  213 +-
 .../internal/compiler/util/GenericXMLWriter.java   |    3 +-
 .../internal/compiler/util/HashtableOfType.java    |   25 +
 .../internal/compiler/util/ManifestAnalyzer.java   |    3 +-
 .../jdt/internal/compiler/util/Messages.java       |    3 +-
 .../jdt/internal/compiler/util/Sorting.java        |   48 +-
 .../eclipse/jdt/internal/compiler/util/Util.java   |   19 +-
 263 files changed, 30174 insertions(+), 4014 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git



More information about the pkg-java-commits mailing list