Some extra backports

Author: Keno

base/compiler/abstractinterpretation.jl

@@ -203,6 +203,8 @@ function const_prop_profitable(@nospecialize(arg))
             isconstType(b) && return true
             const_prop_profitable(b) && return true
         end
+    elseif isa(arg, PartialOpaque)
+        return true
     elseif !isa(arg, Const) || (isa(arg.val, Symbol) || isa(arg.val, Type) || (!isa(arg.val, String) && !ismutable(arg.val)))
         # don't consider mutable values or Strings useful constants
         return true
@@ -1036,7 +1038,13 @@ function abstract_call_opaque_closure(interp::AbstractInterpreter, clos::Partial
         nargtypes = argtypes[2:end]
         pushfirst!(nargtypes, clos.env)
         sig = argtypes_to_type(nargtypes)
-        rt, edge = abstract_call_method(interp, clos.ci::Method, sig, Core.svec(), false, sv)
+        rt, edgecycle, edge = abstract_call_method(interp, clos.ci::Method, sig, Core.svec(), false, sv)
+        if !edgecycle
+            const_rettype = abstract_call_method_with_const_args(interp, rt, argtypes[1], nargtypes, MethodMatch(sig, Core.svec(), clos.ci::Method, false), sv, edgecycle)
+            if const_rettype ⊑ rt
+               rt = const_rettype
+            end
+        end
         return CallMeta(rt, edge)
     end
 end

base/compiler/inferenceresult.jl

@@ -3,7 +3,7 @@
 function is_argtype_match(@nospecialize(given_argtype),
                           @nospecialize(cache_argtype),
                           overridden_by_const::Bool)
-    if isa(given_argtype, Const) || isa(given_argtype, PartialStruct)
+    if isa(given_argtype, Const) || isa(given_argtype, PartialStruct) || isa(given_argtype, PartialOpaque)
         return is_lattice_equal(given_argtype, cache_argtype)
     end
     return !overridden_by_const

base/compiler/ssair/passes.jl

@@ -690,8 +690,14 @@ function getfield_elim_pass!(ir::IRCode)
 
         isempty(leaves) && continue
 
-        field = try_compute_fieldidx_expr(struct_typ, stmt)
-        field === nothing && continue
+        if is_getfield_opaque
+            field = stmt.args[3]
+            isa(field, QuoteNode) && (field = field.value)
+            isa(field, Int) || continue
+        else
+            field = try_compute_fieldidx_expr(struct_typ, stmt)
+            field === nothing && continue
+        end
 
         r = lift_leaves(compact, stmt, result_t, field, leaves, is_getfield_opaque)
         r === nothing && continue

base/compiler/typeutils.jl

@@ -34,6 +34,7 @@ end
 
 function has_nontrivial_const_info(@nospecialize t)
     isa(t, PartialStruct) && return true
+    isa(t, PartialOpaque) && return true
     return isa(t, Const) && !isdefined(typeof(t.val), :instance) && !(isa(t.val, Type) && hasuniquerep(t.val))
 end