Merge remote-tracking branch 'upstream/master' into stable

Author: MartinNowak

.cirrus.yml

@@ -0,0 +1,65 @@
+common_steps_template: &COMMON_STEPS_TEMPLATE
+  clone_dmd_script: |
+    set -uexo pipefail
+    git clone --branch "${CIRRUS_BASE_BRANCH:-$CIRRUS_BRANCH}" --depth 1 https://github.com/dlang/dmd.git ../dmd
+  install_prerequisites_script: cd ../dmd && ./cirrusci.sh
+  install_host_compiler_script: cd ../dmd && ./ci.sh install_host_compiler
+  setup_repos_script: |
+    set -uexo pipefail
+    ln -s $CIRRUS_WORKING_DIR ../druntime
+    cd ../dmd && ./ci.sh setup_repos "${CIRRUS_BASE_BRANCH:-$CIRRUS_BRANCH}"
+  build_script: cd ../dmd && ./ci.sh build
+  test_dmd_script: cd ../dmd && ./ci.sh test_dmd
+  test_druntime_script: cd ../dmd && ./ci.sh test_druntime
+  test_phobos_script: cd ../dmd && ./ci.sh test_phobos
+
+environment:
+  CIRRUS_CLONE_DEPTH: 1
+  # for ci.sh:
+  MODEL: 64
+  HOST_DC: dmd
+  N: 4
+  OS_NAME: linux
+  FULL_BUILD: false
+
+# Linux
+task:
+  name: Ubuntu 16.04 $TASK_NAME_SUFFIX
+  container:
+    image: ubuntu:16.04
+    cpu: 4
+    memory: 8G
+  timeout_in: 60m
+  environment:
+    matrix:
+      - TASK_NAME_SUFFIX: x86
+        MODEL: 32
+      - TASK_NAME_SUFFIX: x64
+  install_git_script: apt-get -q update && apt-get install -yq git-core
+  << : *COMMON_STEPS_TEMPLATE
+
+# Mac
+task:
+  name: macOS 10.15 x64
+  osx_instance:
+    image: catalina-xcode
+  timeout_in: 60m
+  environment:
+    OS_NAME: darwin
+    # override Cirrus default OS (`darwin`)
+    OS: osx
+  << : *COMMON_STEPS_TEMPLATE
+
+# FreeBSD
+task:
+  name: FreeBSD 12.1 x64
+  freebsd_instance:
+    image_family: freebsd-12-1
+    cpu: 4
+    memory: 8G
+  timeout_in: 60m
+  environment:
+    OS_NAME: freebsd
+    CI_DFLAGS: -version=TARGET_FREEBSD12
+  install_bash_and_git_script: pkg install -y bash git
+  << : *COMMON_STEPS_TEMPLATE

azure-pipelines.yml

@@ -2,91 +2,79 @@
 
 variables:
   DMD_BRANCH: $[ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranchName'], 'master') ]
+  VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
 
 jobs:
   - job: Windows
     timeoutInMinutes: 120
     pool:
       vmImage: 'vs2017-win2016'
     variables:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
-      HOST_DMD_VERSION: 2.093.1
+      D_COMPILER: dmd
+      HOST_DMD_VERSION: LATEST
     strategy:
       matrix:
         x64:
           OS: Win_64
           MODEL: 64
           ARCH: x64
-          D_COMPILER: dmd
+        x86-OMF:
+          OS: Win_32
+          MODEL: 32
+          ARCH: x86
     steps:
+      - checkout: self
+        fetchDepth: 1
       - script: set
-        displayName: environment
+        displayName: Print environment variables
       - script: systeminfo
-        displayName: systeminfo
+        displayName: Print system info
       - task: CopyFiles@2
         inputs:
           sourceFolder: '$(Build.SourcesDirectory)'
           contents: '**/*'
           TargetFolder: '$(Build.SourcesDirectory)/../druntime'
-      - script: git clone --branch $(DMD_BRANCH) https://github.com/dlang/dmd.git ../dmd
+      - script: git clone --branch $(DMD_BRANCH) --depth 1 https://github.com/dlang/dmd.git ../dmd
+        displayName: Clone DMD repo
       - script: |
           call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
           cd ../dmd && sh --login .azure-pipelines/windows.sh
-        displayName: Build DMD
+        displayName: Build and test
 
-  - job: Windows_OMF
+  - job: Windows_VisualD
     timeoutInMinutes: 120
     pool:
       vmImage: 'vs2017-win2016'
     variables:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
-      HOST_DMD_VERSION: LATEST
+      D_COMPILER: ldc
+      VISUALD_VER: v0.49.0
+      LDC_VERSION: 1.23.0
     strategy:
       matrix:
-        x86:
+        x86-mscoff:
           OS: Win_32
-          MODEL: 32
+          MODEL: 32mscoff
           ARCH: x86
-          D_COMPILER: dmd
-    steps:
-      - script: set
-        displayName: environment
-      - script: systeminfo
-        displayName: systeminfo
-      - task: CopyFiles@2
-        inputs:
-          sourceFolder: '$(Build.SourcesDirectory)'
-          contents: '**/*'
-          TargetFolder: '$(Build.SourcesDirectory)/../druntime'
-      - script: git clone --branch $(DMD_BRANCH) https://github.com/dlang/dmd.git ../dmd
-      - script: cd ../dmd && sh --login .azure-pipelines/windows.sh
-
-  - job: Windows_VisualD
-    timeoutInMinutes: 120
-    pool:
-      vmImage: 'vs2017-win2016'
-    variables:
-      VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
-      HOST_DMD_VERSION: 2.093.1
-    strategy:
-      matrix:
-        win32-ldc:
+        x86-mscoff_MinGW:
           OS: Win_32
-          MODEL: 32
+          MODEL: 32mscoff
           ARCH: x86
-          D_COMPILER: ldc
-          VISUALD_VER: v0.49.0
-          LDC_VERSION: 1.14.0
+          C_RUNTIME: mingw
     steps:
+      - checkout: self
+        fetchDepth: 1
       - script: set
-        displayName: environment
+        displayName: Print environment variables
       - script: systeminfo
-        displayName: systeminfo
+        displayName: Print system info
       - task: CopyFiles@2
         inputs:
           sourceFolder: '$(Build.SourcesDirectory)'
           contents: '**/*'
           TargetFolder: '$(Build.SourcesDirectory)/../druntime'
-      - script: git clone --branch $(DMD_BRANCH) https://github.com/dlang/dmd.git ../dmd
+      - script: git clone --branch $(DMD_BRANCH) --depth 1 https://github.com/dlang/dmd.git ../dmd
+        displayName: Clone DMD repo
       - script: cd ../dmd && sh --login .azure-pipelines/windows-visual-studio.sh
-      - script: cd ../dmd && call .azure-pipelines\windows-msbuild.bat
+        displayName: Download required binaries
+      - script: cd ../dmd && call .azure-pipelines/windows-msbuild.bat
+        displayName: Build and test

benchmark/gcbench/vdparser.extra/vdc/parser/mod.d

@@ -627,7 +627,6 @@ class DeclarationBlock
 //    "C" ++
 //    "D"
 //    "Windows"
-//    "Pascal"
 //    "System"
 class LinkageAttribute
 {
@@ -691,7 +690,6 @@ Attribute tokenToLinkageType(Token tok)
         case "C":       return Attr_ExternC;
         case "D":       return Attr_ExternD;
         case "Windows": return Attr_ExternWindows;
-        case "Pascal":  return Attr_ExternPascal;
         case "System":  return Attr_ExternSystem;
         default:        return 0;
     }

benchmark/gcbench/vdparser.extra/vdc/util.d

@@ -1,3 +1,4 @@
+
 // This file is part of Visual D
 //
 // Visual D integrates the D programming language into Visual Studio
@@ -110,7 +111,6 @@ enum AttrBits
     ExternCPP,
     ExternD,
     ExternWindows,
-    ExternPascal,
     ExternSystem,
     Export,
     Align,
@@ -124,7 +124,7 @@ enum AttrBits
 mixin(genFlagsEnum("", "Attr_", [__traits(allMembers,AttrBits)]));
 
 enum Attr_AlignMask  = Attr_Align | Attr_Align1 | Attr_Align2 | Attr_Align4 | Attr_Align8 | Attr_Align16;
-enum Attr_CallMask   = Attr_ExternC | Attr_ExternCPP | Attr_ExternD | Attr_ExternWindows | Attr_ExternPascal | Attr_ExternSystem;
+enum Attr_CallMask   = Attr_ExternC | Attr_ExternCPP | Attr_ExternD | Attr_ExternWindows | Attr_ExternSystem;
 enum Attr_ShareMask  = Attr_Shared | Attr_Gshared | Attr_Thread;
 
 alias uint Attribute;
@@ -219,7 +219,6 @@ string attrToString(Attribute attr)
         case Attr_ExternCPP:     return "extern(C++)";
         case Attr_ExternD:       return "extern(D)";
         case Attr_ExternWindows: return "extern(Windows)";
-        case Attr_ExternPascal:  return "extern(Pascal)";
         case Attr_ExternSystem:  return "extern(System)";
         case Attr_Export:        return "export";
         case Attr_Align:         return "align";
@@ -258,7 +257,6 @@ string attrToStringC(Attribute attr)
         case Attr_ExternCPP:     return "";
         case Attr_ExternD:       return "";
         case Attr_ExternWindows: return "__stdcall";
-        case Attr_ExternPascal:  return "__pascal";
         case Attr_ExternSystem:  return "__stdcall";
         case Attr_Export:        return "__declspec(dllexport)";
         case Attr_Align:         return "__declspec(align(4))";

mak/COPY

@@ -123,6 +123,7 @@ COPY=\
 	$(IMPDIR)\core\sys\darwin\sys\event.d \
 	$(IMPDIR)\core\sys\darwin\sys\mman.d \
 	\
+	$(IMPDIR)\core\sys\freebsd\config.d \
 	$(IMPDIR)\core\sys\freebsd\dlfcn.d \
 	$(IMPDIR)\core\sys\freebsd\err.d \
 	$(IMPDIR)\core\sys\freebsd\execinfo.d \

mak/SRCS

@@ -89,6 +89,7 @@ SRCS=\
 	src\core\stdcpp\string.d \
 	src\core\stdcpp\string_view.d \
 	src\core\stdcpp\type_traits.d \
+	src\core\stdcpp\utility.d \
 	src\core\stdcpp\vector.d \
 	src\core\stdcpp\xutility.d \
 	\
@@ -516,6 +517,8 @@ SRCS=\
 	src\rt\memset.d \
 	src\rt\minfo.d \
 	src\rt\monitor_.d \
+	src\rt\msvc.d \
+	src\rt\msvc_math.d \
 	src\rt\profilegc.d \
 	src\rt\qsort.d \
 	src\rt\sections.d \

src/core/attribute.d

@@ -16,14 +16,18 @@
 module core.attribute;
 
 version (D_ObjectiveC)
+{
+    version = UdaOptional;
     version = UdaSelector;
+}
 
 version (Posix)
     version = UdaGNUAbiTag;
 
 version (CoreDdoc)
 {
     version = UdaGNUAbiTag;
+    version = UdaOptional;
     version = UdaSelector;
 }
 
@@ -68,6 +72,68 @@ version (UdaSelector) struct selector
     string selector;
 }
 
+/**
+ * Use this attribute to make an Objective-C interface method optional.
+ *
+ * An optional method is a method that does **not** have to be implemented in
+ * the class that implements the interface. To safely call an optional method,
+ * a runtime check should be performed to make sure the receiver implements the
+ * method.
+ *
+ * This is a special compiler recognized attribute, it has several
+ * requirements, which all will be enforced by the compiler:
+ *
+ * * The attribute can only be attached to methods which have Objective-C
+ *   linkage. That is, a method inside an interface declared as `extern (Objective-C)`
+ *
+ * * It can only be used for methods that are declared inside an interface
+ * * It can only be used once in a method declaration
+ * * It cannot be attached to a method that is a template
+ *
+ * Examples:
+ * ---
+ * import core.attribute : optional, selector;
+ *
+ * extern (Objective-C):
+ *
+ * struct objc_selector;
+ * alias SEL = objc_selector*;
+ *
+ * SEL sel_registerName(in char* str);
+ *
+ * extern class NSObject
+ * {
+ *     bool respondsToSelector(SEL sel) @selector("respondsToSelector:");
+ * }
+ *
+ * interface Foo
+ * {
+ *     @optional void foo() @selector("foo");
+ *     @optional void bar() @selector("bar");
+ * }
+ *
+ * class Bar : NSObject
+ * {
+ *     static Bar alloc() @selector("alloc");
+ *     Bar init() @selector("init");
+ *
+ *     void bar() @selector("bar")
+ *     {
+ *     }
+ * }
+ *
+ * extern (D) void main()
+ * {
+ *     auto bar = Bar.alloc.init;
+ *
+ *     if (bar.respondsToSelector(sel_registerName("bar")))
+ *         bar.bar();
+ * }
+ * ---
+ */
+version (UdaOptional)
+    enum optional;
+
 /**
  * Use this attribute to declare an ABI tag on a C++ symbol.
  *

src/core/demangle.d

@@ -1007,7 +1007,6 @@ pure @safe:
         F       // D
         U       // C
         W       // Windows
-        V       // Pascal
         R       // C++
 
     FuncAttrs:
@@ -1087,10 +1086,6 @@ pure @safe:
             popFront();
             put( "extern (Windows) " );
             break;
-        case 'V': // Pascal
-            popFront();
-            put( "extern (Pascal) " );
-            break;
         case 'R': // C++
             popFront();
             put( "extern (C++) " );
@@ -2399,8 +2394,8 @@ private template isExternCPP(FT) if (is(FT == function))
 private template hasPlainMangling(FT) if (is(FT == function))
 {
     enum lnk = __traits(getLinkage, FT);
-    // C || Pascal || Windows
-    enum hasPlainMangling = lnk == "C" || lnk == "Pascal" || lnk == "Windows";
+    // C || Windows
+    enum hasPlainMangling = lnk == "C" || lnk == "Windows";
 }
 
 @safe pure nothrow unittest
@@ -2523,7 +2518,8 @@ else
          "pure @safe void testexpansion.s!(testexpansion.s!(int).s(int).Result).s(testexpansion.s!(int).s(int).Result).Result.foo()"],
         ["_D13testexpansion__T1sTSQw__TQjTiZQoFiZ6ResultZQBbFQBcZQq3fooMFNaNfZv",
          "pure @safe void testexpansion.s!(testexpansion.s!(int).s(int).Result).s(testexpansion.s!(int).s(int).Result).Result.foo()"],
-        // ambiguity on 'V', template value argument or pascal function
+        // formerly ambiguous on 'V', template value argument or pascal function
+        // pascal functions have now been removed (in v2.095.0)
         ["_D3std4conv__T7enumRepTyAaTEQBa12experimental9allocator15building_blocks15stats_collector7OptionsVQCti64ZQDnyQDh",
          "immutable(char[]) std.conv.enumRep!(immutable(char[]), std.experimental.allocator.building_blocks.stats_collector.Options, 64).enumRep"],
         // symbol back reference to location with symbol back reference