Have copy(ci::CodeInfo) also copy ci.edges. (#33523)

Before this commit, it was a shallow-copy, so the array was shared between the orginal ci and the copy.
JuliaLang · Oct 11, 2019 · 2b1fc4c · 2b1fc4c
1 parent e0f9045
commit 2b1fc4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/base/expr.jl b/base/expr.jl
@@ -67,8 +67,9 @@ function copy(c::CodeInfo)
     cnew.slotflags = copy(cnew.slotflags)
     cnew.codelocs  = copy(cnew.codelocs)
     cnew.linetable = copy(cnew.linetable)
-    cnew.ssaflags = copy(cnew.ssaflags)
-    ssavaluetypes = cnew.ssavaluetypes
+    cnew.ssaflags  = copy(cnew.ssaflags)
+    cnew.edges     = cnew.edges === nothing ? nothing : copy(cnew.edges)
+    ssavaluetypes  = cnew.ssavaluetypes
     ssavaluetypes isa Vector{Any} && (cnew.ssavaluetypes = copy(ssavaluetypes))
     return cnew
 end

diff --git a/test/copy.jl b/test/copy.jl
@@ -193,3 +193,13 @@ end
 let x = Bar17149()
     @test deepcopy(x) !== x
 end
+
+@testset "copying CodeInfo" begin
+    _testfunc() = nothing
+    ci,_ = code_typed(_testfunc, ())[1]
+    ci.edges = [_testfunc]
+
+    ci2 = copy(ci)
+    # Test that edges are not shared
+    @test ci2.edges !== ci.edges
+end