diff options
author | Jay Krell <jay.krell@cornell.edu> | 2018-09-22 02:20:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-22 02:20:48 +0300 |
commit | 3e74629d11ada5bb29c61588e00b44b4fdeabc5e (patch) | |
tree | 819580832fa7eb16b25a839b99c0217c6d9aebaa /msvc | |
parent | 5cb2ef2cc097dd2a7e902f502552103bc9584fa1 (diff) |
[Coop] Convert or partially convert mono_domain_try_type_resolve_typebuilder, mono_domain_try_type_resolve, mono_domain_try_type_resolve_name. (#10675)
* Convert or partially convert mono_domain_try_type_resolve_typebuilder, mono_domain_try_type_resolve, mono_domain_try_type_resolve_name.
In order to use TYPED_HANDLE_DECL, this required splitting handle.h into at least two pieces,
here called handle-decl.h and handle.h.
A fair amount of early returns had to be converted.
* PR: Move mono_domain_try_type_resolve_name from domain-internals.h to reflection-internals.h.
Move mono_domain_try_type_resolve_typebuilder ditto.
Move ves_icall_TypeBuilder_create_runtime_class from object-internals.h to reflection-internals.h.
Move TYPED_HANDLE_DECL (MonoReflectionAssembly) from handle-0.h to reflection-internals.h (previously object-internals.h)
Move TYPED_HANDLE_DECL (MonoReflectionTypeBuilder) ditto.
Add MONO_HANDLE_BOOL to handle.h so we can 1. Stop inverting tests and 2. Prefer
true first in ternary.
x = MONO_HANDLE_BOOL (y) ? z : 0
instead of
x = MONO_HANDLE_IS_NULL (y) ? 0 : z
Add include "reflection-internals.h" to mono-security.c
Add include "reflection-internals.h" to security.h
object-forward.h:
Place MONO_RT_MANAGED_ATTR on MonoReflectionTypeBuilder.
Really it should just be MonoObject, and then implied
by everything that contains it.
Place MONO_RT_MANAGED_ATTR consistently.
Sort by native then managed.
mono_reflection_get_type_with_rootimage: Rename assembly to refection_assembly
and then use assembly to reduce occurences of MONO_HANDLE_GETVAL (assembly, assembly).
mono-security.c: include config.h unconditionally and just once.
* Change mono_class_get_ref_info_raw to return MonoReflectionTypeBuilder* instead of MonoObject*.
Remove casts on mono_class_get_ref_info_raw calls.
Change mono_class_get_ref_info to return MonoReflectionTypeBuilderHandle instead of MonoObjectHandle.
Move mono_class_get_ref_info from object-internals.h to reflection-internals.h.
Use mono_class_get_ref_info instead of mono_class_get_ref_info_raw.
* Cleanup -- MONO_HANDLE_BOOL and contains instead of cast.
* PR: Fix incorrect comment. Fix precise GC hole wrt invoke.
Diffstat (limited to 'msvc')
-rw-r--r-- | msvc/libmonoruntime-common.targets | 1 | ||||
-rw-r--r-- | msvc/libmonoruntime-common.targets.filters | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets index db9c73cdc03..325286e34c4 100644 --- a/msvc/libmonoruntime-common.targets +++ b/msvc/libmonoruntime-common.targets @@ -158,6 +158,7 @@ <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c" /> <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle-decl.h" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32semaphore.h" /> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h" /> diff --git a/msvc/libmonoruntime-common.targets.filters b/msvc/libmonoruntime-common.targets.filters index c05419d1ddb..5617d037984 100644 --- a/msvc/libmonoruntime-common.targets.filters +++ b/msvc/libmonoruntime-common.targets.filters @@ -451,6 +451,9 @@ <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> + <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle-decl.h"> + <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> + </ClInclude> <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h"> <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter> </ClInclude> |