Update RyuJIT package (#1647)

dotnet · Aug 12, 2016 · cd1d3e9 · cd1d3e9
1 parent 801dfaf
commit cd1d3e9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/ILCompiler/src/project.json b/src/ILCompiler/src/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "NETStandard.Library": "1.5.0-rc2-23911",
     "System.CommandLine": "0.1.0-e160514-1",
-    "Microsoft.NETCore.Jit": "1.0.4-beta-24329-01",
+    "Microsoft.NETCore.Jit": "1.0.4-beta-24411-03",
     "Microsoft.DotNet.ObjectWriter": "1.0.13-prerelease-00001"
   },
   "frameworks": {

diff --git a/src/JitInterface/src/CorInfoTypes.cs b/src/JitInterface/src/CorInfoTypes.cs
@@ -240,14 +240,16 @@ public enum CORINFO_RUNTIME_LOOKUP_KIND
         CORINFO_LOOKUP_CLASSPARAM,
     }
 
-    public struct CORINFO_LOOKUP_KIND
+    public unsafe struct CORINFO_LOOKUP_KIND
     {
         private byte _needsRuntimeLookup;
         public bool needsRuntimeLookup { get { return _needsRuntimeLookup != 0; } set { _needsRuntimeLookup = value ? (byte)1 : (byte)0; } }
         public CORINFO_RUNTIME_LOOKUP_KIND runtimeLookupKind;
-        // The 'runtimeLookupFlags' field is just for internal VM / ZAP communication, 
-        // not to be used by the JIT.
+
+        // The 'runtimeLookupFlags' and 'runtimeLookupArgs' fields
+        // are just for internal VM / ZAP communication, not to be used by the JIT.
         public ushort runtimeLookupFlags;
+        public void* runtimeLookupArgs;
     }
 
     // CORINFO_RUNTIME_LOOKUP indicates the details of the runtime lookup
@@ -291,15 +293,15 @@ public struct CORINFO_LOOKUP
         public CORINFO_LOOKUP_KIND lookupKind;
 
         // If kind.needsRuntimeLookup then this indicates how to do the lookup
-        [FieldOffset(16)]
+        [FieldOffset(24)]
         public CORINFO_RUNTIME_LOOKUP runtimeLookup;
 
         // If the handle is obtained at compile-time, then this handle is the "exact" handle (class, method, or field)
         // Otherwise, it's a representative...  If accessType is
         //     IAT_VALUE --> "handle" stores the real handle or "addr " stores the computed address
         //     IAT_PVALUE --> "addr" stores a pointer to a location which will hold the real handle
         //     IAT_PPVALUE --> "addr" stores a double indirection to a location which will hold the real handle
-        [FieldOffset(16)]
+        [FieldOffset(24)]
         public CORINFO_CONST_LOOKUP constLookup;
     }
 

diff --git a/src/JitInterface/src/ThunkGenerator/corinfo.h b/src/JitInterface/src/ThunkGenerator/corinfo.h
@@ -614,10 +614,10 @@ enum CorInfoHelpFunc
     CORINFO_HELP_MEMSET,                // Init block of memory
     CORINFO_HELP_MEMCPY,                // Copy block of memory
 
-    CORINFO_HELP_RUNTIMEHANDLE_METHOD,  // determine a type/field/method handle at run-time
-    CORINFO_HELP_RUNTIMEHANDLE_METHOD_LOG,// determine a type/field/method handle at run-time, with IBC logging
-    CORINFO_HELP_RUNTIMEHANDLE_CLASS,    // determine a type/field/method handle at run-time
-    CORINFO_HELP_RUNTIMEHANDLE_CLASS_LOG,// determine a type/field/method handle at run-time, with IBC logging
+    CORINFO_HELP_RUNTIMEHANDLE_METHOD,          // determine a type/field/method handle at run-time
+    CORINFO_HELP_RUNTIMEHANDLE_METHOD_LOG,      // determine a type/field/method handle at run-time, with IBC logging
+    CORINFO_HELP_RUNTIMEHANDLE_CLASS,           // determine a type/field/method handle at run-time
+    CORINFO_HELP_RUNTIMEHANDLE_CLASS_LOG,       // determine a type/field/method handle at run-time, with IBC logging
 
     // These helpers are required for MDIL backward compatibility only. They are not used by current JITed code.
     CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPEHANDLE_OBSOLETE, // Convert from a TypeHandle (native structure pointer) to RuntimeTypeHandle at run-time
@@ -1311,9 +1311,10 @@ struct CORINFO_LOOKUP_KIND
     bool                        needsRuntimeLookup;
     CORINFO_RUNTIME_LOOKUP_KIND runtimeLookupKind;
 
-    // The 'runtimeLookupFlags' field is just for internal VM / ZAP communication, 
-    // not to be used by the JIT.
+    // The 'runtimeLookupFlags' and 'runtimeLookupArgs' fields
+    // are just for internal VM / ZAP communication, not to be used by the JIT.
     WORD                        runtimeLookupFlags;
+    void *                      runtimeLookupArgs;
 } ;
 
 #else

diff --git a/src/Native/jitinterface/jitinterface.cpp b/src/Native/jitinterface/jitinterface.cpp
@@ -20,6 +20,7 @@ struct CORINFO_LOOKUP_KIND
     bool                        needsRuntimeLookup;
     CORINFO_RUNTIME_LOOKUP_KIND runtimeLookupKind;
     unsigned short              runtimeLookupFlags;
+    void*                       runtimeLookupArgs;
 };
 
 int JitInterfaceWrapper::FilterException(void* pExceptionPointers)

diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets
@@ -93,7 +93,7 @@
                 <!-- TODO: Obtain this from project.lock.json -->
                 <Dependencies><![CDATA[
         <dependency id="Microsoft.DotNet.ObjectWriter" version="1.0.13-prerelease-00001" />
-        <dependency id="Microsoft.NETCore.Jit" version="1.0.4-beta-24329-01" />
+        <dependency id="Microsoft.NETCore.Jit" version="1.0.4-beta-24411-03" />
         <dependency id="NETStandard.Library" version="1.5.0-rc2-23911" />
         <dependency id="System.Collections.Immutable" version="1.2.0-rc2-23911" />
         <dependency id="System.IO.MemoryMappedFiles" version="4.0.0-rc2-23911" />