diff options
| author | Sebastien Pouliot <sebastien.pouliot@gmail.com> | 2017-02-03 21:27:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 21:27:52 +0300 |
| commit | ba7f16981e8cdc52db2894313d3f031d62494d59 (patch) | |
| tree | 98719aadc03b5a30150712211be24061c24a5107 | |
| parent | 78c101158799eccac9116813f95a345cf0096fcd (diff) | |
[cecil][linker] Bump cecil (cycle9 branch) and use the new setter for ExportedType.Scope. Fixes #51805 (#4324)mono-4.8.0.483
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
| m--------- | external/cecil | 0 | ||||
| -rw-r--r-- | mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/external/cecil b/external/cecil -Subproject 8a61754661b2ad9d4fc30700682b636b3bdeb47 +Subproject 2b39856e80d8513f70bc3241ed05325b0de679a 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; } } } |