jjg [Tue, 17 May 2016 10:13:55 -0700] rev 38518
Merge
jjg [Tue, 17 May 2016 10:11:58 -0700] rev 38517
8149599: Update Minefield test
Reviewed-by: martin
mcimadamore [Tue, 17 May 2016 17:53:18 +0100] rev 38516
8156954: javac incorrectly complains of incompatible types
Summary: Add heuristics to pick best stuck constraint as per JLS 18.5.2
Reviewed-by: vromero
redestad [Tue, 17 May 2016 01:35:36 +0200] rev 38515
8157102: Avoid exceptional control flow in Configuration.getText
Reviewed-by: jjg
rfield [Mon, 16 May 2016 21:46:32 -0700] rev 38514
8153920: jshell tool: allow a parameter on the /vars /methods /classes commands
Reviewed-by: vromero
rfield [Mon, 16 May 2016 21:25:44 -0700] rev 38513
8154812: jshell tool: value printing truncation
Reviewed-by: vromero
mcimadamore [Mon, 16 May 2016 14:51:17 +0100] rev 38512
8154180: Regression: stuck expressions do not behave correctly
Summary: ArgumentAttr should not cache stuck trees
Reviewed-by: vromero