--- old/src/jdk.jshell/share/classes/jdk/jshell/Eval.java	2016-01-22 02:17:08.065128571 -0800
+++ new/src/jdk.jshell/share/classes/jdk/jshell/Eval.java	2016-01-22 02:17:07.837126981 -0800
@@ -420,7 +420,7 @@
         TaskFactory.AnalyzeTask at = trialCompile(guts);
         if (!at.hasErrors() && at.firstCuTree() != null) {
             return TreeDissector.createByFirstClass(at)
-                    .typeOfReturnStatement(at.messages(), state.maps::fullClassNameAndPackageToClass);
+                    .typeOfReturnStatement(at, state);
         }
         return null;
     }