From ba7f16981e8cdc52db2894313d3f031d62494d59 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 3 Feb 2017 13:27:52 -0500 Subject: [cecil][linker] Bump cecil (cycle9 branch) and use the new setter for ExportedType.Scope. Fixes #51805 (#4324) Older Cecil (0.9) were saving the scope of the actual type. This changed with Cecil 0.10 where the ExportedType.Scope is saved, which could lead to invalid assemblies being saved with the current linker code (which could not update the scope without the cecil bump) reference: https://bugzilla.xamarin.com/show_bug.cgi?id=51805 --- external/cecil | 2 +- mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/external/cecil b/external/cecil index 8a61754661b..2b39856e80d 160000 --- a/external/cecil +++ b/external/cecil @@ -1 +1 @@ -Subproject commit 8a61754661b2ad9d4fc30700682b636b3bdeb47b +Subproject commit 2b39856e80d8513f70bc3241ed05325b0de679ae diff --git a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs index 73c89cc7991..8ac7358f75a 100644 --- a/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs +++ b/mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs @@ -165,6 +165,7 @@ namespace Mono.Linker.Steps { if ((td != null) && Annotations.IsMarked (td)) { scope = assembly.MainModule.ImportReference (td).Scope; hash.Add (td, scope); + et.Scope = scope; } } } -- cgit v1.2.3