Use objectid

Author: blegat

src/JuMP.jl

@@ -163,7 +163,7 @@ mutable struct GenericModel{T<:Real} <: AbstractModel
     enable_macro_timing::Bool
     macro_times::Dict{Tuple{LineNumberNode,String},Float64}
     # We use `Any` as key because we haven't defined `GenericNonlinearExpr` yet
-    subexpressions::Dict{Any,MOI.ScalarNonlinearFunction}
+    subexpressions::Dict{UInt64,MOI.ScalarNonlinearFunction}
 end
 
 value_type(::Type{GenericModel{T}}) where {T} = T
@@ -278,7 +278,7 @@ function direct_generic_model(
         Dict{Any,MOI.ConstraintIndex}(),
         false,
         Dict{Tuple{LineNumberNode,String},Float64}(),
-        Dict{Any,MOI.ScalarNonlinearFunction}(),
+        Dict{UInt64,MOI.ScalarNonlinearFunction}(),
     )
 end
 

src/nlp_expr.jl

@@ -588,8 +588,9 @@ function moi_function(
     model::JuMP.GenericModel,
 ) where {V}
     cache = model.subexpressions
-    if haskey(cache, f)
-        return cache[f]
+    key = objectid(f)
+    if haskey(cache, key)
+        return cache[key]
     end
     ret = MOI.ScalarNonlinearFunction(f.head, similar(f.args))
     stack = Tuple{MOI.ScalarNonlinearFunction,Int,GenericNonlinearExpr{V}}[]
@@ -604,8 +605,9 @@ function moi_function(
     end
     while !isempty(stack)
         parent, i, arg = pop!(stack)
-        if haskey(cache, arg)
-            parent.args[i] = cache[arg]
+        arg_key = objectid(arg)
+        if haskey(cache, arg_key)
+            parent.args[i] = cache[arg_key]
             continue
         end
         child = MOI.ScalarNonlinearFunction(arg.head, similar(arg.args))
@@ -617,9 +619,9 @@ function moi_function(
                 child.args[j] = moi_function(arg.args[j])
             end
         end
-        cache[arg] = child
+        cache[arg_key] = child
     end
-    cache[f] = ret
+    cache[key] = ret
     return ret
 end