Revert "avoid excessive renaming in subtype of intersection result (#39623)"

This reverts commit 093b2a6.

Author: JeffBezanson

src/gf.c

@@ -1594,22 +1594,26 @@ JL_DLLEXPORT void jl_method_table_disable(jl_methtable_t *mt, jl_method_t *metho
 static int jl_type_intersection2(jl_value_t *t1, jl_value_t *t2, jl_value_t **isect, jl_value_t **isect2)
 {
     *isect2 = NULL;
-    int is_subty = 0;
-    *isect = jl_type_intersection_env_s(t1, t2, NULL, &is_subty);
+    *isect = jl_type_intersection(t1, t2);
     if (*isect == jl_bottom_type)
         return 0;
-    if (is_subty)
-        return 1;
     // determine if type-intersection can be convinced to give a better, non-bad answer
-    // if the intersection was imprecise, see if we can do better by switching the types
-    *isect2 = jl_type_intersection(t2, t1);
-    if (*isect2 == jl_bottom_type) {
-        *isect = jl_bottom_type;
-        *isect2 = NULL;
-        return 0;
-    }
-    if (jl_types_egal(*isect2, *isect)) {
-        *isect2 = NULL;
+    if (!(jl_subtype(*isect, t1) && jl_subtype(*isect, t2))) {
+        // if the intersection was imprecise, see if we can do
+        // better by switching the types
+        *isect2 = jl_type_intersection(t2, t1);
+        if (*isect2 == jl_bottom_type) {
+            *isect = jl_bottom_type;
+            *isect2 = NULL;
+            return 0;
+        }
+        if (jl_subtype(*isect2, t1) && jl_subtype(*isect2, t2)) {
+            *isect = *isect2;
+            *isect2 = NULL;
+        }
+        else if (jl_types_equal(*isect2, *isect)) {
+            *isect2 = NULL;
+        }
     }
     return 1;
 }

src/subtype.c

@@ -2404,9 +2404,7 @@ static jl_value_t *finish_unionall(jl_value_t *res JL_MAYBE_UNROOTED, jl_varbind
         }
     }
 
-    // prefer generating a fresh typevar, to avoid repeated renaming if the result
-    // is compared to one of the intersected types later.
-    if (!varval)
+    if (!varval && (vb->lb != vb->var->lb || vb->ub != vb->var->ub))
         newvar = jl_new_typevar(vb->var->name, vb->lb, vb->ub);
 
     // remove/replace/rewrap free occurrences of this var in the environment
@@ -3266,25 +3264,11 @@ jl_svec_t *jl_outer_unionall_vars(jl_value_t *u)
 static jl_value_t *switch_union_tuple(jl_value_t *a, jl_value_t *b)
 {
     if (jl_is_unionall(a)) {
-        jl_unionall_t *ua = (jl_unionall_t*)a;
-        if (jl_is_unionall(b)) {
-            jl_unionall_t *ub = (jl_unionall_t*)b;
-            if (ub->var->lb == ua->var->lb && ub->var->ub == ua->var->ub) {
-                jl_value_t *ub2 = jl_instantiate_unionall(ub, (jl_value_t*)ua->var);
-                jl_value_t *ans = NULL;
-                JL_GC_PUSH2(&ub2, &ans);
-                ans = switch_union_tuple(ua->body, ub2);
-                if (ans != NULL)
-                    ans = jl_type_unionall(ua->var, ans);
-                JL_GC_POP();
-                return ans;
-            }
-        }
-        jl_value_t *ans = switch_union_tuple(ua->body, b);
+        jl_value_t *ans = switch_union_tuple(((jl_unionall_t*)a)->body, b);
         if (ans == NULL)
             return NULL;
         JL_GC_PUSH1(&ans);
-        ans = jl_type_unionall(ua->var, ans);
+        ans = jl_type_unionall(((jl_unionall_t*)a)->var, ans);
         JL_GC_POP();
         return ans;
     }

test/subtype.jl

@@ -1057,18 +1057,12 @@ function test_intersection()
 end
 
 function test_intersection_properties()
-    approx = Tuple{Vector{Vector{T}} where T, Vector{Vector{T}} where T}
     for T in menagerie
         for S in menagerie
             I = _type_intersect(T,S)
             I2 = _type_intersect(S,T)
             @test isequal_type(I, I2)
-            if I == approx
-                # TODO: some of these cases give a conservative answer
-                @test issub(I, T) || issub(I, S)
-            else
-                @test issub(I, T) && issub(I, S)
-            end
+            @test issub(I, T) && issub(I, S)
             if issub(T, S)
                 @test isequal_type(I, T)
             end