hg: jdk8/tl/langtools: 2 new changesets

2013-11-26 Thread jan . lahoda
Changeset: 8acb838c9b79
Author:jlahoda
Date:  2013-11-26 15:27 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/8acb838c9b79

8026374: javac accepts void as a method parameter
Summary: Changing Check.validate to reject void types.
Reviewed-by: jjg, vromero

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
+ test/tools/javac/declaration/method/MethodVoidParameter.java
+ test/tools/javac/declaration/method/MethodVoidParameter.out

Changeset: 756ae3791c45
Author:jlahoda
Date:  2013-11-26 15:33 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/756ae3791c45

8027789: Access method for Outer.super.m() references indirect superclass
Summary: Internally convert the qualified super access to an equivalent of an 
unqualified super access inside the access method.
Reviewed-by: vromero, jjg

! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
+ test/tools/javac/expression/_super/NonDirectSuper/Base.java
+ test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
+ test/tools/javac/expression/_super/NonDirectSuper/Target11.java



hg: jdk8/tl/langtools: 2 new changesets

2013-10-23 Thread jan . lahoda
Changeset: abc3eaccba73
Author:jlahoda
Date:  2013-10-23 23:02 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/abc3eaccba73

8027191: Fix for JDK-8026861 refers to an incorrect bug number
Summary: Reverting changeset b05db8c815e8, so that it can be applied again with 
a correct bug number
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
- test/tools/javac/T8019486/WrongLNTForLambdaTest.java
+ test/tools/javac/T8019486/WrongLVTForLambdaTest.java

Changeset: 864dafc5ab7a
Author:jlahoda
Date:  2013-10-23 07:50 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/864dafc5ab7a

8026861: Wrong LineNumberTable for variable declarations in lambdas
Summary: Setting or correcting positions for many trees produced by 
LambdaToMethod.
Reviewed-by: vromero, rfield

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+ test/tools/javac/T8019486/WrongLNTForLambdaTest.java
- test/tools/javac/T8019486/WrongLVTForLambdaTest.java



hg: jdk8/tl/langtools: 2 new changesets

2013-10-22 Thread jonathan . gibbons
Changeset: 351d6808c1a5
Author:jjg
Date:  2013-10-22 17:42 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/351d6808c1a5

8027119: Cleanup javadoc comments for taglet API
Reviewed-by: mduigou

! src/share/classes/com/sun/javadoc/Tag.java

Changeset: 41d3ffca22ff
Author:jjg
Date:  2013-10-22 17:44 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/41d3ffca22ff

Merge




hg: jdk8/tl/langtools: 2 new changesets

2013-10-09 Thread jan . lahoda
Changeset: 0be3f1820e8b
Author:jlahoda
Date:  2013-10-09 13:06 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/0be3f1820e8b

8025141: java.lang.ClassFormatError: Illegal field modifiers in class (...)
Summary: Should not generate non-public $assertionsDisabled field into 
interfaces
Reviewed-by: jjg, vromero

! src/share/classes/com/sun/tools/javac/comp/Lower.java
+ test/tools/javac/defaultMethods/Assertions.java
+ 
test/tools/javac/defaultMethods/CannotChangeAssertionsStateAfterInitialized.java

Changeset: 1b469fd31e35
Author:jlahoda
Date:  2013-10-09 13:09 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/1b469fd31e35

8025087: Annotation processing api returns default modifier for interface 
static method
Summary: ClassReader must not set Flags.DEFAULT for interface static methods
Reviewed-by: vromero, jjg

! make/build.xml
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/defaultMethods/BadClassfile.java
! test/tools/javac/diags/examples.not-yet.txt
+ 
test/tools/javac/diags/examples/InvalidDefaultInterface/InvalidDefaultInterface.java
+ 
test/tools/javac/diags/examples/InvalidDefaultInterface/processors/CreateBadClassFile.java
+ 
test/tools/javac/diags/examples/InvalidStaticInterface/InvalidStaticInterface.java
+ 
test/tools/javac/diags/examples/InvalidStaticInterface/processors/CreateBadClassFile.java
! test/tools/javac/processing/model/element/TestExecutableElement.java



hg: jdk8/tl/langtools: 2 new changesets

2013-08-16 Thread maurizio . cimadamore
Changeset: ec77c7b46c37
Author:jlahoda
Date:  2013-08-15 22:33 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/ec77c7b46c37

8015809: More user friendly compile-time errors for uncaught exceptions in 
lambda expression
Summary: Producing individual errors for uncaught undeclared exceptions inside 
lambda expressions, rather than one error for the whole lambda
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
- test/tools/javac/diags/examples/IncompatibleThrownTypesInLambda.java
+ test/tools/javac/lambda/ExceptionsInLambda.java
+ test/tools/javac/lambda/ExceptionsInLambda.out
! test/tools/javac/lambda/TargetType21.out

Changeset: f657d400c736
Author:jlahoda
Date:  2013-08-15 22:36 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f657d400c736

8022508: javac crashes if the generics arity of a base class is wrong
Reviewed-by: mcimadamore, vromero

! src/share/classes/com/sun/tools/javac/comp/Check.java
! test/tools/javac/generics/8016640/T8016640.java



hg: jdk8/tl/langtools: 2 new changesets

2013-08-12 Thread maurizio . cimadamore
Changeset: f7f271bd74a2
Author:mcimadamore
Date:  2013-08-12 17:25 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f7f271bd74a2

6537020: JCK tests: a compile-time error should be given in case of ambiguously 
imported fields (types, methods)
Summary: Hiding check does not support interface multiple inheritance
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Scope.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! test/tools/javac/4980495/static/Test.out
! 
test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java
! test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java
! test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java
+ test/tools/javac/staticImport/6537020/T6537020.java
+ test/tools/javac/staticImport/6537020/T6537020.out

Changeset: af80273f630a
Author:mcimadamore
Date:  2013-08-12 17:28 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/af80273f630a

8021567: Javac doesn't report \"java: reference to method is ambiguous\" any 
more
Summary: Javac incorrectly forgets about constant folding results within lambdas
Reviewed-by: jjg, vromero

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
+ test/tools/javac/lambda/8021567/T8021567.java
+ test/tools/javac/lambda/8021567/T8021567.out
+ test/tools/javac/lambda/8021567/T8021567b.java



hg: jdk8/tl/langtools: 2 new changesets

2013-06-19 Thread chris . hegarty
Changeset: be62183f938a
Author:chegar
Date:  2013-06-19 11:48 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/be62183f938a

8017045: anti-delta fix for 8013789
Reviewed-by: alanb

! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! test/tools/javac/lambda/lambdaExpression/LambdaTest6.java
! test/tools/javac/lambda/methodReference/BridgeMethod.java

Changeset: 29dcd6715b04
Author:chegar
Date:  2013-06-19 13:00 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/29dcd6715b04

Merge

! src/share/classes/com/sun/tools/javac/comp/Check.java



hg: jdk8/tl/langtools: 2 new changesets

2013-04-17 Thread lana . steuck
Changeset: 1f19b84efa6d
Author:lana
Date:  2013-04-16 08:16 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/1f19b84efa6d

Merge

- src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java
- test/tools/javac/diags/examples/SecondaryBoundMustBeMarkerIntf.java
- test/tools/javac/lambda/Intersection01.out
- test/tools/javac/lambda/TargetType01.out

Changeset: 94870c08391c
Author:lana
Date:  2013-04-17 10:31 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/94870c08391c

Merge




hg: jdk8/tl/langtools: 2 new changesets

2013-04-11 Thread lana . steuck
Changeset: 2c9acb17f41a
Author:katleman
Date:  2013-04-11 09:40 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/2c9acb17f41a

Added tag jdk8-b85 for changeset 4a48f3173534

! .hgtags

Changeset: d13af7751456
Author:lana
Date:  2013-04-11 19:15 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/d13af7751456

Merge




hg: jdk8/tl/langtools: 2 new changesets

2013-03-28 Thread maurizio . cimadamore
Changeset: 7bebe17ff323
Author:mcimadamore
Date:  2013-03-28 11:38 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/7bebe17ff323

8010469: Bad assertion in LambdaToMethod
Summary: Add assertion in LambdaToMethod.serializedLambdaName
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

Changeset: a200d8ccfe47
Author:mcimadamore
Date:  2013-03-28 11:39 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/a200d8ccfe47

8010490: FindBugs: double assignments in LambdaToMethod.visitIdent
Summary: Remove dead code from LambdaToMethod
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java



hg: jdk8/tl/langtools: 2 new changesets

2013-03-12 Thread maurizio . cimadamore
Changeset: 6db9a3b1a93f
Author:mcimadamore
Date:  2013-03-12 16:02 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/6db9a3b1a93f

8008540: Constructor reference to non-reifiable array should be rejected
8008539: Spurious error when constructor reference mention an interface type
8008538: Constructor reference accepts wildcard parameterized types
Summary: Overhaul of Check.checkConstructorRefType
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
! test/tools/javac/lambda/MethodReference38.out
+ test/tools/javac/lambda/MethodReference64.java
+ test/tools/javac/lambda/MethodReference64.out

Changeset: 5ddecb91d843
Author:mcimadamore
Date:  2013-03-12 16:02 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/5ddecb91d843

8009545: Graph inference: dependencies between inference variables should be 
set during incorporation
Summary: Move all transitivity checks into the incorporation round
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! test/tools/javac/lambda/TargetType28.out



hg: jdk8/tl/langtools: 2 new changesets

2013-02-06 Thread maurizio . cimadamore
Changeset: 1df20330f6bd
Author:mcimadamore
Date:  2013-02-06 14:03 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/1df20330f6bd

8007463: Cleanup inference related classes
Summary: Make Infer.InferenceContext an inner class; adjust bound replacement 
logic in Type.UndetVar
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/util/List.java
! test/tools/javac/generics/inference/7154127/T7154127.out
! test/tools/javac/lib/DPrinter.java

Changeset: 8cdd96f2fdb9
Author:mcimadamore
Date:  2013-02-06 14:04 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/8cdd96f2fdb9

8007479: Refactor DeferredAttrContext so that it points to parent context
Summary: Move DeferredAttrNode out of DeferredAttrContext; add support for 
nested deferred contexts
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java



hg: jdk8/tl/langtools: 2 new changesets

2013-02-04 Thread lana . steuck
Changeset: 716935fec613
Author:katleman
Date:  2013-01-31 17:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/716935fec613

Added tag jdk8-b75 for changeset c2e11e2ec4a3

! .hgtags

Changeset: 10619513f51a
Author:lana
Date:  2013-02-04 22:38 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/10619513f51a

Merge




hg: jdk8/tl/langtools: 2 new changesets

2013-01-22 Thread jonathan . gibbons
Changeset: f5b70712e0d5
Author:jjg
Date:  2013-01-22 19:06 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f5b70712e0d5

8006728: temporarily workaround jtreg problems for doclint tests in othervm
Reviewed-by: jjh

+ test/tools/doclint/html/AAA.java
+ test/tools/doclint/tidy/AAA.java
+ test/tools/doclint/tool/AAA.java

Changeset: 385828dd5604
Author:jjg
Date:  2013-01-22 19:07 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/385828dd5604

Merge




hg: jdk8/tl/langtools: 2 new changesets

2013-01-16 Thread maurizio . cimadamore
Changeset: f785dcac17b7
Author:mcimadamore
Date:  2013-01-16 16:27 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f785dcac17b7

8005854: Add support for array constructor references
Summary: Support constructor references of the kind int[]::new
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
+ test/tools/javac/lambda/MethodReference59.java
+ test/tools/javac/lambda/MethodReference60.java
+ test/tools/javac/lambda/MethodReference60.out

Changeset: 7aa2025bbb7b
Author:mcimadamore
Date:  2013-01-16 16:30 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/7aa2025bbb7b

8005299: Add FunctionalInterface checking to javac
Summary: Javac should check that types annotated with @FunctionalInterface are 
indeed functional interfaces
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Symtab.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
! test/tools/javac/diags/examples.not-yet.txt
+ test/tools/javac/diags/examples/BadFunctionalIntfAnno.java
! test/tools/javac/lambda/BadConv03.out
! test/tools/javac/lambda/BadLambdaPos.out
! test/tools/javac/lambda/BadTargetType.out
+ test/tools/javac/lambda/FunctionalInterfaceAnno.java
+ test/tools/javac/lambda/FunctionalInterfaceAnno.out
! test/tools/javac/lambda/Intersection01.out
! test/tools/javac/lambda/LambdaConv09.out
! test/tools/javac/lambda/LambdaExpr10.out
! test/tools/javac/lambda/MethodReference04.out
! test/tools/javac/lambda/TargetType17.out
! test/tools/javac/lambda/TargetType43.out
! test/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.out
! test/tools/javac/lambda/funcInterfaces/NonSAM1.out
! test/tools/javac/lambda/funcInterfaces/NonSAM3.out
! test/tools/javac/lambda/lambdaExpression/AbstractClass_neg.out
! test/tools/javac/lambda/lambdaExpression/InvalidExpression5.out



hg: jdk8/tl/langtools: 2 new changesets

2012-12-18 Thread lana . steuck
Changeset: d7360bf35ee1
Author:lana
Date:  2012-12-14 13:15 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/d7360bf35ee1

Merge


Changeset: 573b38691a74
Author:lana
Date:  2012-12-18 18:15 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/573b38691a74

Merge




hg: jdk8/tl/langtools: 2 new changesets

2012-11-04 Thread maurizio . cimadamore
Changeset: d7d932236fee
Author:mcimadamore
Date:  2012-11-04 10:59 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/d7d932236fee

7192246: Add type-checking support for default methods
Summary: Add type-checking support for default methods as per 
Featherweight-Defender document
Reviewed-by: jjg, dlsmith

! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/AttrContext.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/jvm/Items.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/defaultMethods/ClassReaderTest/ClassReaderTest.java
+ test/tools/javac/defaultMethods/ClassReaderTest/pkg/Foo.java
+ test/tools/javac/defaultMethods/Neg01.java
+ test/tools/javac/defaultMethods/Neg01.out
+ test/tools/javac/defaultMethods/Neg02.java
+ test/tools/javac/defaultMethods/Neg02.out
+ test/tools/javac/defaultMethods/Neg03.java
+ test/tools/javac/defaultMethods/Neg03.out
+ test/tools/javac/defaultMethods/Neg04.java
+ test/tools/javac/defaultMethods/Neg04.out
+ test/tools/javac/defaultMethods/Neg05.java
+ test/tools/javac/defaultMethods/Neg05.out
+ test/tools/javac/defaultMethods/Neg06.java
+ test/tools/javac/defaultMethods/Neg06.out
+ test/tools/javac/defaultMethods/Neg07.java
+ test/tools/javac/defaultMethods/Neg07.out
+ test/tools/javac/defaultMethods/Neg08.java
+ test/tools/javac/defaultMethods/Neg08.out
+ test/tools/javac/defaultMethods/Neg09.java
+ test/tools/javac/defaultMethods/Neg09.out
+ test/tools/javac/defaultMethods/Neg10.java
+ test/tools/javac/defaultMethods/Neg10.out
+ test/tools/javac/defaultMethods/Neg11.java
+ test/tools/javac/defaultMethods/Neg11.out
+ test/tools/javac/defaultMethods/Neg12.java
+ test/tools/javac/defaultMethods/Neg12.out
+ test/tools/javac/defaultMethods/Neg13.java
+ test/tools/javac/defaultMethods/Neg13.out
+ test/tools/javac/defaultMethods/Neg14.java
+ test/tools/javac/defaultMethods/Neg14.out
+ test/tools/javac/defaultMethods/Neg15.java
+ test/tools/javac/defaultMethods/Neg15.out
+ test/tools/javac/defaultMethods/Neg16.java
+ test/tools/javac/defaultMethods/Neg16.out
+ test/tools/javac/defaultMethods/Pos01.java
+ test/tools/javac/defaultMethods/Pos02.java
+ test/tools/javac/defaultMethods/Pos04.java
+ test/tools/javac/defaultMethods/Pos05.java
+ test/tools/javac/defaultMethods/Pos06.java
+ test/tools/javac/defaultMethods/Pos07.java
+ test/tools/javac/defaultMethods/Pos08.java
+ test/tools/javac/defaultMethods/Pos10.java
+ test/tools/javac/defaultMethods/Pos11.java
+ test/tools/javac/defaultMethods/Pos12.java
+ test/tools/javac/defaultMethods/Pos13.java
+ test/tools/javac/defaultMethods/Pos14.java
+ test/tools/javac/defaultMethods/Pos15.java
+ test/tools/javac/defaultMethods/Pos16.java
+ test/tools/javac/defaultMethods/TestDefaultBody.java
+ test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
+ test/tools/javac/defaultMethods/crossCompile/Clinit.java
+ test/tools/javac/defaultMethods/crossCompile/CrossCompile.java
+ test/tools/javac/defaultMethods/fd/FDTest.java
+ test/tools/javac/defaultMethods/fd/shapegen/ClassCase.java
+ test/tools/javac/defaultMethods/fd/shapegen/Hierarchy.java
+ test/tools/javac/defaultMethods/fd/shapegen/HierarchyGenerator.java
+ test/tools/javac/defaultMethods/fd/shapegen/Rule.java
+ test/tools/javac/defaultMethods/fd/shapegen/RuleGroup.java
+ test/tools/javac/defaultMethods/fd/shapegen/TTNode.java
+ test/tools/javac/defaultMethods/fd/shapegen/TTParser.java
+ test/tools/javac/defaultMethods/fd/shapegen/TTShape.java
+ test/tools/javac/defaultMethods/separate/Separate.java
+ test/tools/javac/defaultMethods/separate/pkg1/A.java
+ test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java
+ test/tools/javac/diags/examples/DefaultOverridesObjectMember.java
+ test/tools/javac/diags/examples/OverriddenDefault.java
+ test/tools/javac/diags/examples/RedundantSupertype.java
+ test/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java
+ test/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java
! test/tools/javac/generics/7022054/T7022054pos1.java
! test/tools/javac/generics/7022054/T7022054pos2.java
! test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java

Changeset: dbc94b8363dd
Author:mcimadamore
Date:  2012-11-04 11:01 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/dbc94b8363dd

8000931: Cleanup Resolve.java
Summary: Unif

hg: jdk8/tl/langtools: 2 new changesets

2012-11-02 Thread jonathan . gibbons
Changeset: 2443d24d096a
Author:vromero
Date:  2012-11-01 13:06 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/2443d24d096a

6949443: visitTree assertion triggered using -Xjcov on small sample program
Reviewed-by: jjg, mcimadamore

! src/share/classes/com/sun/tools/javac/jvm/CRTable.java
+ test/tools/javac/options/T6949443.java

Changeset: a33770a91b00
Author:jjg
Date:  2012-11-02 19:17 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/a33770a91b00

Merge




hg: jdk8/tl/langtools: 2 new changesets

2012-08-10 Thread lana . steuck
Changeset: 23032c78b2d1
Author:katleman
Date:  2012-08-09 18:02 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/23032c78b2d1

Added tag jdk8-b51 for changeset c4cd4cab2220

! .hgtags

Changeset: 1d2db0e5eabc
Author:lana
Date:  2012-08-10 10:14 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/1d2db0e5eabc

Merge




hg: jdk8/tl/langtools: 2 new changesets

2012-08-07 Thread lana . steuck
Changeset: c4cd4cab2220
Author:katleman
Date:  2012-08-02 15:37 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/c4cd4cab2220

Added tag jdk8-b50 for changeset b2d8a270f5f2

! .hgtags

Changeset: cfa70d7ac944
Author:lana
Date:  2012-08-07 20:24 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/cfa70d7ac944

Merge




hg: jdk8/tl/langtools: 2 new changesets

2012-06-27 Thread lana . steuck
Changeset: a39c99192184
Author:katleman
Date:  2012-06-21 17:08 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/a39c99192184

Added tag jdk8-b44 for changeset 59cbead12ff4

! .hgtags

Changeset: e111e4587cca
Author:lana
Date:  2012-06-25 21:39 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/e111e4587cca

Merge

- src/share/classes/com/sun/tools/javac/parser/EndPosTable.java



hg: jdk8/tl/langtools: 2 new changesets

2012-06-05 Thread lana . steuck
Changeset: 02c5a3575539
Author:cl
Date:  2012-06-01 14:12 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/02c5a3575539

Added tag jdk8-b41 for changeset 179fa85aeefa

! .hgtags

Changeset: 252f8b7473e1
Author:lana
Date:  2012-06-05 17:40 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/252f8b7473e1

Merge




hg: jdk8/tl/langtools: 2 new changesets

2012-05-31 Thread maurizio . cimadamore
Changeset: af6a4c24f4e3
Author:mcimadamore
Date:  2012-05-31 17:42 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/af6a4c24f4e3

7166552: Inference: cleanup usage of Type.ForAll
Summary: Remove hack to callback into type-inference from assignment context
Reviewed-by: dlsmith, jjg

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/AttrContext.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/6758789/T6758789b.out
! test/tools/javac/diags/examples.not-yet.txt
! test/tools/javac/diags/examples/ApplicableMethodFound1.java
! test/tools/javac/diags/examples/CantApplyDiamond1.java
- test/tools/javac/diags/examples/FullInstSig.java
! test/tools/javac/diags/examples/IncompatibleTypes1.java
! test/tools/javac/diags/examples/InferredDoNotConformToLower.java
- test/tools/javac/diags/examples/InvalidInferredTypes.java
+ test/tools/javac/diags/examples/NoUniqueMaximalInstance.java
- test/tools/javac/diags/examples/UndeterminedType1.java
! test/tools/javac/diags/examples/WhereFreshTvar.java
! test/tools/javac/generics/7015430/T7015430.out
! test/tools/javac/generics/7151802/T7151802.out
! test/tools/javac/generics/inference/6315770/T6315770.out
! test/tools/javac/generics/inference/6638712/T6638712b.out
! test/tools/javac/generics/inference/6638712/T6638712e.out
! test/tools/javac/generics/inference/6650759/T6650759m.out
! test/tools/javac/generics/inference/7154127/T7154127.out
! test/tools/javac/varargs/6313164/T6313164.out

Changeset: 37dc15c68760
Author:mcimadamore
Date:  2012-05-31 17:44 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/37dc15c68760

7160084: javac fails to compile an apparently valid class/interface combination
Summary: javac generates wrong syntetized trees for nested enum constants
Reviewed-by: dlsmith, jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+ test/tools/javac/enum/7160084/T7160084a.java
+ test/tools/javac/enum/7160084/T7160084b.java



hg: jdk8/tl/langtools: 2 new changesets

2012-03-30 Thread maurizio . cimadamore
Changeset: 379bc17d9a26
Author:mcimadamore
Date:  2012-03-30 19:19 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/379bc17d9a26

7157688: Regression: common compiler diagnostic features swapped required/found 
types
Summary: bug in resource key in compiler.properties
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/resources/compiler.properties

Changeset: c94c09f34701
Author:mcimadamore
Date:  2012-03-30 19:19 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/c94c09f34701

7157165: Regression: code with disjunctive type crashes javac
Summary: Bad recovery logic in parser code that checks for generic cast
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+ test/tools/javac/parser/7157165/T7157165.java
+ test/tools/javac/parser/7157165/T7157165.out



hg: jdk8/tl/langtools: 2 new changesets

2012-03-06 Thread maurizio . cimadamore
Changeset: c2234816495f
Author:mcimadamore
Date:  2012-03-06 16:48 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/c2234816495f

7151070: NullPointerException in Resolve.isAccessible
Summary: Spurious accessibility check in TransTypes
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+ test/tools/javac/generics/7151070/T7151070.java
+ test/tools/javac/generics/7151070/T7151070.out

Changeset: eaae5cf911be
Author:mcimadamore
Date:  2012-03-06 16:50 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/eaae5cf911be

7148556: Implementing a generic interface causes a public clone() to become 
inaccessible
Summary: Implementation of Resolve.isOverriddenIn() should distinguish between 
classes/interfaces
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Symbol.java
+ test/tools/javac/generics/rawOverride/T7148556.java



hg: jdk8/tl/langtools: 2 new changesets

2011-11-28 Thread maurizio . cimadamore
Changeset: 9448fe783fd2
Author:mcimadamore
Date:  2011-11-28 15:56 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/9448fe783fd2

7115050: Add parser support for lambda expressions
Summary: Add support for parsing lambda expressions to JavacParser
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/parser/Lexer.java
! src/share/classes/com/sun/tools/javac/parser/Scanner.java
! src/share/classes/com/sun/tools/javac/parser/Tokens.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples/CatchWithoutTry.java
+ test/tools/javac/diags/examples/LambdaNotSupported.java
+ test/tools/javac/diags/examples/NotAStatement.java
! test/tools/javac/generics/rare/6665356/T6665356.out
+ test/tools/javac/lambda/LambdaParserTest.java

Changeset: 3343b22e2761
Author:mcimadamore
Date:  2011-11-28 16:05 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/3343b22e2761

7115052: Add parser support for method references
Summary: Add support for parsing method references to JavacParser
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Source.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/parser/Tokens.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples/IllegalChar.java
+ test/tools/javac/diags/examples/MethodReferencesNotSupported.java
+ test/tools/javac/lambda/MethodReferenceParserTest.java
! test/tools/javac/quid/T6999438.out



hg: jdk8/tl/langtools: 2 new changesets

2011-11-24 Thread maurizio . cimadamore
Changeset: c896d95e7469
Author:mcimadamore
Date:  2011-11-24 13:36 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/c896d95e7469

7115046: Add AST node for lambda expressions
Summary: Add tree nodes for representing lambda expressions and update relevant 
visitors interfaces
Reviewed-by: jjg

+ src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
! src/share/classes/com/sun/source/tree/Tree.java
! src/share/classes/com/sun/source/tree/TreeVisitor.java
! src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
! src/share/classes/com/sun/source/util/TreeScanner.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/tree/Pretty.java
! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java

Changeset: ec59a2ce9114
Author:mcimadamore
Date:  2011-11-24 13:38 +
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/ec59a2ce9114

7115049: Add AST node for method references
Summary: Add tree nodes for representing method/constructor references and 
update relevant visitors interfaces
Reviewed-by: jjg

+ src/share/classes/com/sun/source/tree/MemberReferenceTree.java
! src/share/classes/com/sun/source/tree/Tree.java
! src/share/classes/com/sun/source/tree/TreeVisitor.java
! src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
! src/share/classes/com/sun/source/util/TreeScanner.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/tree/Pretty.java
! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java



hg: jdk8/tl/langtools: 2 new changesets

2011-11-08 Thread jonathan . gibbons
Changeset: 36553cb94345
Author:jjg
Date:  2011-11-08 17:06 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/36553cb94345

7108668: allow Log to be initialized and used earlier
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/apt/comp/Apt.java
! src/share/classes/com/sun/tools/javac/api/JavacTool.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/main/Main.java
! src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
! src/share/classes/com/sun/tools/javac/util/JavacMessages.java
! src/share/classes/com/sun/tools/javac/util/Log.java
! src/share/classes/com/sun/tools/javac/util/Options.java
! src/share/classes/com/sun/tools/javadoc/Start.java

Changeset: ae361e7f435a
Author:jjg
Date:  2011-11-08 17:06 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/ae361e7f435a

7108669: cleanup Log methods for direct printing to streams
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/apt/main/Main.java
! src/share/classes/com/sun/tools/javac/api/JavacTool.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/main/JavacOption.java
! src/share/classes/com/sun/tools/javac/main/Main.java
! src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
! 
src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
! src/share/classes/com/sun/tools/javac/util/Log.java
! test/tools/javac/6410653/T6410653.java
! test/tools/javac/diags/ArgTypeCompilerFactory.java



hg: jdk8/tl/langtools: 2 new changesets

2011-10-24 Thread maurizio . cimadamore
Changeset: d346ab55031b
Author:mcimadamore
Date:  2011-10-24 13:00 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/d346ab55031b

7096014: Javac tokens should retain state
Summary: Refactor javac tokens from enum constants to stateful instances (to 
keep track of position, comments, etc.)
Reviewed-by: jjg

! src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
- src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java
! src/share/classes/com/sun/tools/javac/parser/EndPosParser.java
+ src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+ src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
- src/share/classes/com/sun/tools/javac/parser/Keywords.java
! src/share/classes/com/sun/tools/javac/parser/Lexer.java
! src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
! src/share/classes/com/sun/tools/javac/parser/Scanner.java
! src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
- src/share/classes/com/sun/tools/javac/parser/Token.java
+ src/share/classes/com/sun/tools/javac/parser/Tokens.java
+ src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
! 
src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javadoc/JavadocTool.java
! test/tools/javac/api/TestJavacTaskScanner.java
+ test/tools/javac/depDocComment/DeprecatedDocComment3.java
+ test/tools/javac/tree/DocCommentToplevelTest.java

Changeset: 05814303a056
Author:mcimadamore
Date:  2011-10-24 13:00 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/05814303a056

7098660: Write better overload resolution/inference tests
Summary: Add overload/inference debug diagnostics - added test harness using 
annotations to check outcome of overload resolution/inference
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Printer.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/diags/examples/ApplicableMethodFound.java
+ test/tools/javac/diags/examples/ApplicableMethodFound1.java
+ test/tools/javac/diags/examples/DeferredMethodInst.java
+ test/tools/javac/diags/examples/FullInstSig.java
+ test/tools/javac/diags/examples/NotApplicableMethodFound.java
+ test/tools/javac/diags/examples/PartialInstSig.java
+ test/tools/javac/diags/examples/VerboseResolveMulti.java
+ test/tools/javac/diags/examples/VerboseResolveMulti1.java
+ test/tools/javac/resolve/Candidate.java
+ test/tools/javac/resolve/Pos.java
+ test/tools/javac/resolve/ResolveHarness.java
+ test/tools/javac/resolve/TraceResolve.java
+ test/tools/javac/resolve/tests/BoxedReturnTypeInference.java
+ test/tools/javac/resolve/tests/PrimitiveOverReferenceOverInferred.java
+ test/tools/javac/resolve/tests/PrimitiveOverReferenceOverVarargs.java
+ test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java
+ test/tools/javac/resolve/tests/PrimitiveOverload.java
+ test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java
+ test/tools/javac/resolve/tests/ReferenceOverInferred.java
+ test/tools/javac/resolve/tests/ReferenceOverVarargs.java
+ test/tools/javac/resolve/tests/ReferenceOverload.java



hg: jdk8/tl/langtools: 2 new changesets

2011-10-17 Thread maurizio . cimadamore
Changeset: b5d0b8effc85
Author:mcimadamore
Date:  2011-10-17 12:54 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/b5d0b8effc85

7097436: Project Coin: duplicate varargs warnings on method annotated with 
@SafeVarargs
Summary: Duplicate aliasing check during subtyping leads to spurious varargs 
diagnostic
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/varargs/7097436/T7097436.java
+ test/tools/javac/varargs/7097436/T7097436.out
! test/tools/javac/varargs/warning/Warn5.java

Changeset: 3cdfa97e1be9
Author:mcimadamore
Date:  2011-10-17 12:57 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/3cdfa97e1be9

7093325: Redundant entry in bytecode exception table
Summary: Inlining of finalizers does not update gaps list accordingly
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
+ test/tools/javac/T7093325.java



hg: jdk8/tl/langtools: 2 new changesets

2011-09-12 Thread jonathan . gibbons
Changeset: edd7d9bd32dd
Author:jjg
Date:  2011-09-12 11:39 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/edd7d9bd32dd

7068451: Regression: javac compiles fixed sources against previous, not 
current, version of generated sources
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
! src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
! src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
+ test/tools/javac/file/T7068451.java

Changeset: f1431cace56e
Author:jjg
Date:  2011-09-12 11:40 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f1431cace56e

Merge




hg: jdk8/tl/langtools: 2 new changesets

2011-08-31 Thread maurizio . cimadamore
Changeset: b86277584776
Author:mcimadamore
Date:  2011-08-31 16:11 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/b86277584776

7085024: internal error; cannot instantiate Foo
Summary: Types.isConvertible does not handle erroneous types correctly
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/7085024/T7085024.java
+ test/tools/javac/7085024/T7085024.out

Changeset: d0257833498e
Author:mcimadamore
Date:  2011-08-31 16:15 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/d0257833498e

7079713: javac hangs when compiling a class that references a cyclically 
inherited class
Summary: Types.membersClosure needs to handle pathological cases of cyclic 
inheritance
Reviewed-by: jjg, jjh

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/7079713/TestCircularClassfile.java



hg: jdk8/tl/langtools: 2 new changesets

2011-07-22 Thread kelly . ohair
Changeset: 2d3096441387
Author:ohair
Date:  2011-07-22 17:35 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/2d3096441387

7069993: Adjust make/jprt.properties file for jdk8
Reviewed-by: katleman

! make/jprt.properties

Changeset: 36f31b87b0ab
Author:ohair
Date:  2011-07-22 21:31 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/36f31b87b0ab

Merge