Fix build breaks in arm64 and legacy internal amd64 builds

[tfs-changeset: 1604829]

Commit migrated from https://github.com/dotnet/coreclr/commit/e1bb404b8d22a1f4c53176a12b4e0333adfdab1f

diff --git a/src/coreclr/src/jit/flowgraph.cpp b/src/coreclr/src/jit/flowgraph.cpp
index 44e0274..6bd0155 100644 (file)
--- a/src/coreclr/src/jit/flowgraph.cpp
+++ b/src/coreclr/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/coreclr/src/jit/importer.cpp b/src/coreclr/src/jit/importer.cpp
index e210e65..d16b72b 100644 (file)
--- a/src/coreclr/src/jit/importer.cpp
+++ b/src/coreclr/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/coreclr/src/vm/arm64/stubs.cpp b/src/coreclr/src/vm/arm64/stubs.cpp
index 426093b..0d49f0e 100644 (file)
--- a/src/coreclr/src/vm/arm64/stubs.cpp
+++ b/src/coreclr/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