Merge branch 'master' into portable-tailcall-helpers

jakobbotsch · Mar 21, 2020 · cc36784 · cc36784
2 parents bd4fe1b + cf63e73
commit cc36784
Show file tree

Hide file tree

Showing 116 changed files with 1,565 additions and 1,031 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -82,9 +82,6 @@
 
   <!-- Language configuration -->
   <PropertyGroup>
-    <!-- default to allowing all language features -->
-    <LangVersion>latest</LangVersion>
-    <LangVersion Condition="'$(Language)' == 'C#'">preview</LangVersion>
     <Deterministic>true</Deterministic>
 
     <!-- Resource naming bug: https://github.com/microsoft/msbuild/issues/4740 -->

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -24,6 +24,13 @@
     <GeneratedAssemblyInfoFile>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(MSBuildProjectName).AssemblyInfo$(DefaultLanguageSourceExtension)'))</GeneratedAssemblyInfoFile>
   </PropertyGroup>
 
+  <!-- Language configuration -->
+  <PropertyGroup>
+    <!-- default to allowing all language features -->
+    <LangVersion>preview</LangVersion>
+    <LangVersion Condition="'$(Language)' == 'VB'">latest</LangVersion>
+  </PropertyGroup>
+
   <!--
     All source inputs to the compiler should be generated before BeforeCompile target. Sdk is not
     honoring this for GenerateAssemblyInfo target. https://github.com/dotnet/sdk/issues/10614 

diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml
@@ -28,9 +28,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     jobParameters:
       testGroup: jitstress
 
@@ -46,9 +46,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     helixQueueGroup: ci
     helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
     jobParameters:

diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml
@@ -28,9 +28,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     jobParameters:
       testGroup: jitstress2-jitstressregs
 
@@ -46,9 +46,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     helixQueueGroup: ci
     helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
     jobParameters:

diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml
@@ -28,9 +28,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     jobParameters:
       testGroup: jitstressregs
 
@@ -46,9 +46,9 @@ jobs:
     - Linux_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    # Currently no Windows arm32, Windows arm64 hardware in Helix. https://github.com/dotnet/runtime/issues/1097
+    # Currently no Windows arm32 testing. https://github.com/dotnet/runtime/issues/1097
     #- Windows_NT_arm
-    #- Windows_NT_arm64
+    - Windows_NT_arm64
     helixQueueGroup: ci
     helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
     jobParameters:

diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
@@ -500,7 +500,7 @@ if %__BuildNative% EQU 1 (
 
     echo %__MsgPrefix%Regenerating the Visual Studio solution
 
-    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native"
+    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native" "-DCLR_REPO_ROOT_DIR=%__RepoRootDir%"
     call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
     if not !errorlevel! == 0 (
         echo %__ErrMsgPrefix%%__MsgPrefix%Error: failed to generate native component build project!

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
@@ -561,7 +561,7 @@ if %__BuildNative% EQU 1 (
 
     echo %__MsgPrefix%Regenerating the Visual Studio solution
 
-    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native"
+    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native" "-DCLR_REPO_ROOT_DIR=%__RepoRootDir%"
     call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
     if not !errorlevel! == 0 (
         echo %__ErrMsgPrefix%%__MsgPrefix%Error: failed to generate native component build project!

diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt
@@ -110,6 +110,7 @@ set(CORECLR_LIBRARIES
     utilcode
     v3binder
     libraries-native
+    System.Globalization.Native-Static
     interop
 )
 
@@ -136,7 +137,6 @@ else()
         ${END_WHOLE_ARCHIVE}
         mscorrc
         palrt
-        System.Globalization.Native-Static
     )
 endif(CLR_CMAKE_TARGET_WIN32)
 

diff --git a/src/coreclr/src/libraries-native/CMakeLists.txt b/src/coreclr/src/libraries-native/CMakeLists.txt
@@ -2,14 +2,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(GLOBALIZATION_NATIVE_DIR ${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/System.Globalization.Native)
 
 # Suppress exporting of the PAL APIs
-add_definitions(-DPALEXPORT=)
+add_definitions(-DPALEXPORT=EXTERN_C)
 
-if(CLR_CMAKE_HOST_UNIX)
-  include_directories("${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/Common")
-  include_directories("${GLOBALIZATION_NATIVE_DIR}")
+include_directories("${GLOBALIZATION_NATIVE_DIR}")
+include_directories("${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix/Common")
 
-  add_subdirectory(${GLOBALIZATION_NATIVE_DIR} System.Globalization.Native)
-endif()
+add_subdirectory(${GLOBALIZATION_NATIVE_DIR} System.Globalization.Native)
 
 add_library(libraries-native
     STATIC

diff --git a/src/coreclr/src/libraries-native/entrypoints.c b/src/coreclr/src/libraries-native/entrypoints.c
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#ifdef TARGET_UNIX
-
-#include "pal_types.h"
+#include <stdint.h>
 
 typedef uint16_t UChar;
 
@@ -19,15 +17,13 @@ typedef uint16_t UChar;
 #include "pal_idna.h"
 #include "pal_normalization.h"
 #include "pal_timeZoneInfo.h"
-#endif // TARGET_UNIX
 
-#define FCFuncStart(name) extern const void* name[]; const void* name[] = {
+#define FCFuncStart(name) EXTERN_C const void* name[]; const void* name[] = {
 #define FCFuncEnd() (void*)0x01 /* FCFuncFlag_EndOfArray */ };
 
 #define QCFuncElement(name,impl) \
     (void*)0x8 /* FCFuncFlag_QCall */, (void*)(impl), (void*)name,
 
-#ifdef TARGET_UNIX
 FCFuncStart(gPalGlobalizationNative)
     QCFuncElement("ChangeCase", GlobalizationNative_ChangeCase)
     QCFuncElement("ChangeCaseInvariant", GlobalizationNative_ChangeCaseInvariant)
@@ -64,4 +60,3 @@ FCFuncStart(gPalGlobalizationNative)
     QCFuncElement("ToAscii", GlobalizationNative_ToAscii)
     QCFuncElement("ToUnicode", GlobalizationNative_ToUnicode)
 FCFuncEnd()
-#endif // TARGET_UNIX
diff --git a/src/coreclr/src/vm/dllimport.cpp b/src/coreclr/src/vm/dllimport.cpp
@@ -4795,7 +4795,7 @@ void NDirect::PopulateNDirectMethodDesc(NDirectMethodDesc* pNMD, PInvokeStaticSi
     if (callConv == pmCallConvThiscall)
         ndirectflags |= NDirectMethodDesc::kThisCall;
 
-    if (pNMD->GetLoaderModule()->IsSystem() && (strcmp(szLibName, "QCall") == 0 || strcmp(szLibName, "System.Globalization.Native") == 0))
+    if (pNMD->GetLoaderModule()->IsSystem() && (strcmp(szLibName, "QCall") == 0 || strcmp(szLibName, "libSystem.Globalization.Native") == 0))
     {
         ndirectflags |= NDirectMethodDesc::kIsQCall;
     }

diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h
@@ -1243,11 +1243,9 @@ FCClassElement("FileLoadException", "System.IO", gFileLoadExceptionFuncs)
 FCClassElement("GC", "System", gGCInterfaceFuncs)
 FCClassElement("GCHandle", "System.Runtime.InteropServices", gGCHandleFuncs)
 FCClassElement("GCSettings", "System.Runtime", gGCSettingsFuncs)
-#ifdef TARGET_UNIX
 #ifndef CROSSGEN_COMPILE
 FCClassElement("Globalization", "", gPalGlobalizationNative)
 #endif
-#endif
 #ifdef FEATURE_COMINTEROP
 FCClassElement("IEnumerable", "System.Collections", gStdMngIEnumerableFuncs)
 FCClassElement("IEnumerator", "System.Collections", gStdMngIEnumeratorFuncs)