Merge master to nmirror

BuildToolsVersion.txt

@@ -1 +1 @@
-2.0.0-prerelease-02118-01
+2.1.0-prerelease-02221-02

Documentation/cross-building.md

@@ -63,8 +63,7 @@ sudo ./cross/build-rootfs.sh x86 xenial
 2. Build CoreFX (`Debug` version)
 3. Build CoreRT for armel, x64, x86
 ```
-sudo ./cross/build-rootfs.sh armel tizen
-sudo ./cross/build-rootfs.sh x86 xenial
+sudo ./cross/build-rootfs.sh armel tizen cross
 ./build.sh clang3.9 armel debug verbose cross
 ./build.sh debug verbose skiptests
 ./build.sh clang3.9 x86 debug verbose cross skiptests

cross/build-rootfs.sh

@@ -2,9 +2,10 @@
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [LinuxCodeName]"
+    echo "Usage: $0 [BuildArch] [LinuxCodeName] [cross]"
     echo "BuildArch can be: arm(default), armel, arm64, x86"
     echo "LinuxCodeName - optional, Code name for Linux, can be: trusty(default), vivid, wily, jessie, xenial. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
+    echo "cross - optional, it initializes rootfs for cross building, works only for armel tizen now"
     exit 1
 }
 
@@ -84,6 +85,17 @@ for i in "$@"
             __UbuntuRepo=
             __Tizen=tizen
             ;;
+        cross)
+            if [ "$__Tizen" != "tizen" ]; then
+                echo "Cross building rootfs is available only for armel tizen."
+                usage;
+                exit 1;
+            fi
+            # Cross building is available for armel tizen only with x86 rootfs
+            echo Building x86 xenial rootfs for armel tizen cross build...
+            $0 x86 xenial
+            echo Building armel rootfs...
+            ;;
         --skipunmount)
             __SkipUnmount=1
             ;;

dependencies.props

@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RyuJITVersion>2.1.0-preview1-25912-02</RyuJITVersion>
+    <RyuJITVersion>2.1.0-preview1-25925-02</RyuJITVersion>
     <ObjectWriterVersion>1.0.19-prerelease-00001</ObjectWriterVersion>
-    <CoreFxVersion>4.5.0-preview1-25813-02</CoreFxVersion>
-    <CoreFxUapVersion>4.6.0-preview1-25813-02</CoreFxUapVersion>
-    <MicrosoftNETCoreNativeVersion>2.1.0-preview1-25806-01</MicrosoftNETCoreNativeVersion>
+    <CoreFxVersion>4.5.0-preview1-25925-02</CoreFxVersion>
+    <CoreFxUapVersion>4.6.0-preview1-25925-02</CoreFxUapVersion>
+    <MicrosoftNETCoreNativeVersion>2.1.0-preview1-25925-02</MicrosoftNETCoreNativeVersion>
     <MicrosoftNETCoreAppPackageVersion>2.0.0</MicrosoftNETCoreAppPackageVersion>
     <XunitNetcoreExtensionsVersion>1.0.1-prerelease-02104-02</XunitNetcoreExtensionsVersion>
   </PropertyGroup>

src/Common/src/TypeSystem/Common/ExceptionStringID.cs

@@ -31,6 +31,7 @@ public enum ExceptionStringID
         InvalidProgramSpecific,
         InvalidProgramVararg,
         InvalidProgramCallVirtFinalize,
+        InvalidProgramNativeCallable,
 
         // BadImageFormatException
         BadImageFormatGeneric,

src/Common/src/TypeSystem/IL/Stubs/ILEmitter.cs

@@ -442,8 +442,15 @@ internal void PatchLabels()
 
         public void DefineSequencePoint(string document, int lineNumber)
         {
-            Debug.Assert(_sequencePoints.Count == 0 || _sequencePoints[_sequencePoints.Count - 1].Offset < _length);
-            _sequencePoints.Add(new ILSequencePoint(_length, document, lineNumber));
+            // Last sequence point defined for this offset wins.
+            if (_sequencePoints.Count > 0 && _sequencePoints[_sequencePoints.Count - 1].Offset == _length)
+            {
+                _sequencePoints[_sequencePoints.Count - 1] = new ILSequencePoint(_length, document, lineNumber);
+            }
+            else
+            {
+                _sequencePoints.Add(new ILSequencePoint(_length, document, lineNumber));
+            }
         }
     }
 

src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/INodeWithDebugInfo.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+
 using Internal.JitInterface;
 using Internal.TypeSystem;
 
@@ -53,4 +53,17 @@ public DebugVarInfo(string name, bool isParam, TypeDesc type)
             this.Ranges = new List<NativeVarInfo>();
         }
     }
+
+    public static class WellKnownLineNumber
+    {
+        /// <summary>
+        /// Informs the debugger that it should step through the annotated sequence point.
+        /// </summary>
+        public const int DebuggerStepThrough = 0xF00F00;
+
+        /// <summary>
+        /// Informs the debugger that it should step into the annotated sequence point.
+        /// </summary>
+        public const int DebuggerStepIn = 0xFEEFEE;
+    }
 }

src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ReadyToRunHelperNode.cs

@@ -36,7 +36,7 @@ public enum ReadyToRunHelperId
         DefaultConstructor,
     }
 
-    public partial class ReadyToRunHelperNode : AssemblyStubNode
+    public partial class ReadyToRunHelperNode : AssemblyStubNode, INodeWithDebugInfo
     {
         private ReadyToRunHelperId _id;
         private Object _target;
@@ -189,6 +189,45 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
             return null;
         }
 
+        DebugLocInfo[] INodeWithDebugInfo.DebugLocInfos
+        {
+            get
+            {
+                if (_id == ReadyToRunHelperId.VirtualCall)
+                {
+                    // Generate debug information that lets debuggers step into the virtual calls.
+                    // We generate a step into sequence point at the point where the helper jumps to
+                    // the target of the virtual call.
+                    TargetDetails target = ((MethodDesc)_target).Context.Target;
+                    int debuggerStepInOffset = -1;
+                    switch (target.Architecture)
+                    {
+                        case TargetArchitecture.X64:
+                            debuggerStepInOffset = 3;
+                            break;
+                    }
+                    if (debuggerStepInOffset != -1)
+                    {
+                        return new DebugLocInfo[]
+                        {
+                            new DebugLocInfo(0, String.Empty, WellKnownLineNumber.DebuggerStepThrough),
+                            new DebugLocInfo(debuggerStepInOffset, String.Empty, WellKnownLineNumber.DebuggerStepIn)
+                        };
+                    }
+                }
+
+                return Array.Empty<DebugLocInfo>();
+            }
+        }
+
+        DebugVarInfo[] INodeWithDebugInfo.DebugVarInfos
+        {
+            get
+            {
+                return Array.Empty<DebugVarInfo>();
+            }
+        }
+
 #if !SUPPORT_JIT
         protected internal override int ClassCode => -911637948;
 

src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/Target_X64/X64ReadyToRunHelperNode.cs

@@ -44,6 +44,7 @@ protected override void EmitCode(NodeFactory factory, ref X64Emitter encoder, bo
                             slot = VirtualMethodSlotHelper.GetVirtualMethodSlot(factory, targetMethod);
                             Debug.Assert(slot != -1);
                         }
+                        Debug.Assert(((INodeWithDebugInfo)this).DebugLocInfos[1].NativeOffset == encoder.Builder.CountBytes);
 
                         AddrMode jmpAddrMode = new AddrMode(encoder.TargetRegister.Result, null, EETypeNode.GetVTableOffset(pointerSize) + (slot * pointerSize), 0, AddrModeSize.Int64);
                         encoder.EmitJmpToAddrMode(ref jmpAddrMode);

src/ILCompiler.Compiler/src/IL/ILImporter.Scanner.cs

@@ -406,6 +406,11 @@ private void ImportCall(ILOpcode opcode, int token)
 
             TypeDesc exactType = method.OwningType;
 
+            if (method.IsNativeCallable && (opcode != ILOpcode.ldftn && opcode != ILOpcode.ldvirtftn))
+            {
+                ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramNativeCallable, method);
+            }
+
             bool resolvedConstraint = false;
             bool forceUseRuntimeLookup = false;
 

src/ILCompiler.Compiler/src/IL/Stubs/StartupCode/StartupCodeMainMethod.cs

@@ -218,9 +218,7 @@ public override MethodIL EmitIL()
                 ILEmitter emit = new ILEmitter();
                 ILCodeStream codeStream = emit.NewCodeStream();
 
-                // We only need the initial step over sequence point if there's any instructions before the call.
-                if (Signature.Length > 0)
-                    codeStream.MarkDebuggerStepThroughPoint();
+                codeStream.MarkDebuggerStepThroughPoint();
 
                 for (int i = 0; i < Signature.Length; i++)
                     codeStream.EmitLdArg(i);

src/ILCompiler.DependencyAnalysisFramework/ILCompiler-DependencyGraph-Viewer/ILCompiler-DependencyGraph-Viewer.csproj

@@ -34,6 +34,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -86,6 +89,7 @@
     <EmbeddedResource Include="SingleDependencyGraphForm.resx">
       <DependentUpon>SingleDependencyGraphForm.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

src/ILCompiler.DependencyAnalysisFramework/ILCompiler-DependencyGraph-Viewer/app.manifest

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>

src/ILCompiler.WebAssembly/src/CodeGen/ILToWebAssemblyImporter.cs

@@ -847,12 +847,9 @@ private LLVMValueRef LLVMFunctionForMethod(MethodDesc callee, StackEntry thisPoi
 
         private LLVMValueRef GetOrCreateMethodSlot(MethodDesc method)
         {
-            var globalRefName = "__getslot__" + _compilation.NameMangler.GetMangledMethodName(method);
-            LLVMValueRef slot = LLVM.GetNamedGlobal(Module, globalRefName);
-            if(slot.Pointer == IntPtr.Zero)
-            {
-                slot = LLVM.AddGlobal(Module, LLVM.Int32Type(), globalRefName);
-            }
+            var vtableSlotSymbol = _compilation.NodeFactory.VTableSlot(method);
+            _dependencies.Add(vtableSlotSymbol);
+            LLVMValueRef slot = LoadAddressOfSymbolNode(vtableSlotSymbol);
             return LLVM.BuildLoad(_builder, slot, string.Empty);
         }