diff options
| author | Toni Solarin-Sodara <toni.edward@outlook.com> | 2018-08-14 19:50:42 +0300 |
|---|---|---|
| committer | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2018-08-14 19:50:42 +0300 |
| commit | c214863ad3e4da15fb3b56fa9c82ef359fee55fe (patch) | |
| tree | 576cbddfcd403739018cc219b4593735ac0d3ff1 /src/System.Private.Reflection.Execution | |
| parent | d55ebfd33d4d45afbdf1a3adedc32a839c5a4a69 (diff) | |
Preliminary Interpreter Support (#6182)
Diffstat (limited to 'src/System.Private.Reflection.Execution')
3 files changed, 4 insertions, 11 deletions
diff --git a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecution.cs b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecution.cs index f0261574f..c8b4a019e 100644 --- a/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecution.cs +++ b/src/System.Private.Reflection.Execution/src/Internal/Reflection/Execution/ReflectionExecution.cs @@ -64,10 +64,6 @@ namespace Internal.Reflection.Execution }; ExecutionEnvironment = executionEnvironment; - -#if SUPPORT_JIT - Internal.Runtime.TypeLoader.MethodExecutionStrategy.GlobalExecutionStrategy = new Internal.Runtime.JitSupport.RyuJitExecutionStrategy(); -#endif } // diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj index 069aa60a9..d70b8fc7a 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <AssemblyName>System.Private.Reflection.Execution.Experimental</AssemblyName> <EcmaMetadataSupport>true</EcmaMetadataSupport> - <JitSupport>true</JitSupport> + <DynamicCodeSupport>true</DynamicCodeSupport> </PropertyGroup> <Import Project="System.Private.Reflection.Execution.csproj" /> diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj index 5b935ef32..ed737d170 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj @@ -13,9 +13,6 @@ <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> </PropertyGroup> - <PropertyGroup Condition="'$(JitSupport)' == 'true'"> - <DefineConstants>SUPPORT_JIT;$(DefineConstants)</DefineConstants> - </PropertyGroup> <!-- Setup the right references --> <ItemGroup> @@ -28,17 +25,18 @@ <Aliases>global,System_Private_CoreLib</Aliases> </ProjectReference> <ProjectReference Include="..\..\System.Private.Reflection.Metadata\src\System.Private.Reflection.Metadata.csproj" /> - - <ProjectReference Include="..\..\System.Private.Interop\src\System.Private.Interop.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true' and '$(EcmaMetadataSupport)' != 'true'"> + <ProjectReference Include="..\..\System.Private.Interop\src\System.Private.Interop.csproj" /> <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.csproj" /> <ProjectReference Include="..\..\System.Private.Reflection.Core\src\System.Private.Reflection.Core.csproj" /> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true' and '$(EcmaMetadataSupport)' == 'true'"> + <ProjectReference Include="..\..\System.Private.Interop\src\System.Private.Interop.Experimental.csproj" /> <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.Experimental.csproj" /> <ProjectReference Include="..\..\System.Private.Reflection.Core\src\System.Private.Reflection.Core.Experimental.csproj" /> <ProjectReference Include="..\..\System.Private.Jit\src\System.Private.Jit.csproj" /> + <ProjectReference Include="..\..\System.Private.Interpreter\src\System.Private.Interpreter.csproj" /> </ItemGroup> <PropertyGroup> @@ -95,7 +93,6 @@ <Compile Include="Internal\Reflection\Extensions\NonPortable\DelegateMethodInfoRetriever.cs" /> <Compile Include="Internal\Runtime\CompilerHelpers\LibraryInitializer.cs" /> <Compile Include="System\Reflection\MissingRuntimeArtifactException.cs" /> - </ItemGroup> <ItemGroup> <Compile Include="..\..\Common\src\Internal\Runtime\MetadataBlob.cs" > |