diff options
| author | Matt Ellis <matell@microsoft.com> | 2016-05-14 23:09:52 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2016-05-14 23:09:52 -0700 |
| commit | bd7549da15efca09231ac09091c7b8b1a9c29f17 (patch) | |
| tree | 3c46a9ed3c679c9ee8aa8ada0742a9a3a4660b06 | |
| parent | 3152c81965b5d0e5bfa43d136577d23da8d73ad7 (diff) | |
| parent | e1bb404b8d22a1f4c53176a12b4e0333adfdab1f (diff) | |
| download | coreclr-bd7549da15efca09231ac09091c7b8b1a9c29f17.tar.gz coreclr-bd7549da15efca09231ac09091c7b8b1a9c29f17.tar.bz2 coreclr-bd7549da15efca09231ac09091c7b8b1a9c29f17.zip | |
Merge pull request #4976 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/jit/flowgraph.cpp | 3 | ||||
| -rw-r--r-- | src/jit/importer.cpp | 5 | ||||
| -rw-r--r-- | src/vm/arm64/stubs.cpp | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp index 44e0274d12..6bd0155ea5 100644 --- a/src/jit/flowgraph.cpp +++ b/src/jit/flowgraph.cpp @@ -7820,6 +7820,7 @@ void Compiler::fgAddReversePInvokeEnterExit() { assert(opts.IsReversePInvoke()); +#if COR_JIT_EE_VERSION > 460 lvaReversePInvokeFrameVar = lvaGrabTempWithImplicitUse(false DEBUGARG("Reverse Pinvoke FrameVar")); LclVarDsc* varDsc = &lvaTable[lvaReversePInvokeFrameVar]; @@ -7869,6 +7870,8 @@ void Compiler::fgAddReversePInvokeEnterExit() printf("\n"); } #endif + +#endif // COR_JIT_EE_VERSION > 460 } /***************************************************************************** diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp index e210e6520b..d16b72b7c9 100644 --- a/src/jit/importer.cpp +++ b/src/jit/importer.cpp @@ -4557,8 +4557,9 @@ void Compiler::impImportAndPushBox (CORINFO_RESOLVED_TOKEN * pResolved // Note we can only box do it if the class construtor has been called // We can always do it on primitive types - GenTreePtr op1, op2 = nullptr; - var_types lclTyp; + GenTreePtr op1 = nullptr; + GenTreePtr op2 = nullptr; + var_types lclTyp; impSpillSpecialSideEff(); diff --git a/src/vm/arm64/stubs.cpp b/src/vm/arm64/stubs.cpp index 426093b6c8..0d49f0e3bb 100644 --- a/src/vm/arm64/stubs.cpp +++ b/src/vm/arm64/stubs.cpp @@ -1984,6 +1984,14 @@ PCODE DynamicHelpers::CreateHelperWithTwoArgs(LoaderAllocator * pAllocator, TADD p += 8; END_DYNAMIC_HELPER_EMIT(); } + +PCODE DynamicHelpers::CreateDictionaryLookupHelper(LoaderAllocator * pAllocator, CORINFO_RUNTIME_LOOKUP * pLookup) +{ + STANDARD_VM_CONTRACT; + + // TODO (NYI) + ThrowHR(E_NOTIMPL); +} #endif // FEATURE_READYTORUN #endif // CROSSGEN_COMPILE |