From fdead2b3793fd530e05331649e655576f30e59e9 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Tue, 19 Feb 2013 17:16:13 +0100 Subject: [nomaster] SI-7291: No exception throwing for diverging implicit expansion Since we don't throw exceptions for normal errors it was a bit odd that we don't do that for DivergingImplicit. As SI-7291 shows, the logic behind catching/throwing exception was broken for divergence. Instead of patching it, I rewrote the mechanism so that we now another SearchFailure type related to diverging expansion, similar to ambiguous implicit scenario. The logic to prevent diverging expansion from stopping the search had to be slightly adapted but works as usual. The upside is that we don't have to catch diverging implicit for example in the presentation compiler which was again showing that something was utterly broken with the exception approach. NOTE: This is a partial backport of https://github.com/scala/scala/pull/2428, with a fix for SI-7291, but without removal of error kinds (the former is absolutely necessary, while the latter is nice to have, but not a must, therefore I'm not risking porting it to 2.10.x). Also, the fix for SI-7291 is hidden behind a flag named -Xdivergence211 in order not to occasionally break the code, which relies on pre-fix behavior. --- test/files/neg/t696b.flags | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/files/neg/t696b.flags (limited to 'test/files/neg/t696b.flags') diff --git a/test/files/neg/t696b.flags b/test/files/neg/t696b.flags new file mode 100644 index 0000000000..d564f2b1f8 --- /dev/null +++ b/test/files/neg/t696b.flags @@ -0,0 +1 @@ +-Xdivergence211 \ No newline at end of file -- cgit v1.2.3