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

.gitignore

@@ -7,7 +7,7 @@ druntime.json
 .DS_Store
 trace.def
 trace.log
-Makefile
+/Makefile
 /errno_c*.obj
 /msvc*.obj
 make

Jenkinsfile

@@ -0,0 +1,22 @@
+#!/bin/env groovy
+
+def clone (repo_url, git_ref = "master") {
+    checkout(
+        poll: false,
+        scm: [
+            $class: 'GitSCM',
+            branches: [[name: git_ref]],
+            extensions: [[$class: 'CleanBeforeCheckout']],
+            userRemoteConfigs: [[url: repo_url]]
+        ]
+    )
+}
+
+def pipeline
+node {
+    dir('dlang/ci') {
+        clone 'https://github.com/Dicebot/dlangci.git', 'master'
+    }
+    pipeline = load 'dlang/ci/pipeline.groovy'
+}
+pipeline.runPipeline()

changelog/README.md

@@ -1,21 +1,31 @@
+This directory will get copied to dlang.org and cleared when master gets
+merged into stable prior to a new release.
+
 How to add a new changelog entry to the pending changelog?
 ==========================================================
 
-This will get copied to dlang.org and cleared when master gets
-merged into stable prior to a new release.
+Create a new file in the `changelog` folder. It should end with `.dd` and look
+similar to a git commit message. The first line represents the title of the change.
+After an empty line follows the long description:
 
 ```
-My fancy new feature X
+My fancy title of the new feature
 
-A long description of the new feature.
+A long description of the new feature in `std.range`.
+It can be followed by an example:
 -------
-import std.range;
-import std.algorithm.comparison;
+import std.range : padLeft, padRight;
+import std.algorithm.comparison : equal;
 
 assert([1, 2, 3, 4, 5].padLeft(0, 7).equal([0, 0, 1, 2, 3, 4, 5]));
 
 assert("Hello World!".padRight('!', 15).equal("Hello World!!!!"));
 -------
+and links to the documentation, e.g. $(REF drop, std, range) or
+$(REF_ALTTEXT a custom name for the function, drop, std, range).
+
+Links to the spec can look like this $(LINK2 $(ROOT_DIR)spec/module.html, this)
+and of course you can link to other $(LINK2 https://forum.dlang.org/, external resources).
 ```
 
 The title can't contain links (it's already one).
@@ -24,11 +34,9 @@ For more infos, see the [Ddoc spec](https://dlang.org/spec/ddoc.html).
 Preview changes
 ---------------
 
-If you have cloned the [tools](https://github.com/dlang/tools) and [dlang.org](https://github.com/dlang/dlang.org) repo),
-you can preview the changelog:
+If you have cloned the [tools](https://github.com/dlang/tools) and [dlang.org](https://github.com/dlang/dlang.org) repo,
+you can preview the changelog with:
 
 ```
-../tools/changed.d -o ../dlang.org/changelog/pending.dd && make -C ../dlang.org -f posix.mak html
+make -C ../dlang.org -f posix.mak pending_changelog
 ```
-
-and then open `../dlang.org/web/changelog/pending.html` with your favorite browser.

changelog/disable-TypeInfo.init.dd

@@ -0,0 +1,12 @@
+`TypeInfo.init` has been `@disable`d.
+
+$(REF_OBJECT_SHORT TypeInfo.init) has been `@disable`d. Use
+$(REF_OBJECT_SHORT TypeInfo.initializer) instead.
+
+`TypeInfo.init` is a legacy alias of the method that is now called
+$(REF_OBJECT_SHORT TypeInfo.initializer). The name change is necessary because
+the name "init" clashes with the type property of the same name
+($(GLINK2 property, init)).
+
+The legacy alias has been deprecated since 2.072.0. It's going to be removed in
+2.075.0.

circle.yml

@@ -7,11 +7,10 @@ dependencies:
 test:
   override:
     - make -f posix.mak style
+    - ./circleci.sh setup-repos
     - ./circleci.sh coverage:
         parallel: true
         timeout: 1200
 
   post:
-    # CodeCov gets confused by stored .lst files
-    - rm -rf test/coverage/generated
-    - bash <(curl -s https://codecov.io/bash)
+    - ./circleci.sh codecov

circleci.sh

@@ -2,32 +2,41 @@
 
 set -uexo pipefail
 
-HOST_DMD_VER=2.068.2 # same as in dmd/src/posix.mak
+HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 N=2
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
+CIRCLE_PROJECT_REPONAME=${CIRCLE_PROJECT_REPONAME:-druntime}
 
 case $CIRCLE_NODE_INDEX in
     0) MODEL=64 ;;
     1) MODEL=32 ;;
 esac
 
-install_deps() {
-    if [ $MODEL -eq 32 ]; then
-        sudo apt-get update
-        sudo apt-get install g++-multilib
-    fi
-
+download() {
+    local url="$1"
+    local fallbackurl="$2"
+    local outputfile="$3"
     for i in {0..4}; do
-        if curl -fsS -A "$CURL_USER_AGENT" --max-time 5 https://dlang.org/install.sh -O; then
+        if curl -fsS -A "$CURL_USER_AGENT" --max-time 5 "$url" -o "$outputfile" ||
+           curl -fsS -A "$CURL_USER_AGENT" --max-time 5 "$fallbackurl" -o "$outputfile" ; then
             break
         elif [ $i -ge 4 ]; then
             sleep $((1 << $i))
         else
-            echo 'Failed to download install script' 1>&2
+            echo "Failed to download script ${outputfile}" 1>&2
             exit 1
         fi
     done
+}
+
+install_deps() {
+    if [ $MODEL -eq 32 ]; then
+        sudo apt-get update
+        sudo apt-get install g++-multilib
+    fi
+
+    download "https://dlang.org/install.sh" "https://nightlies.dlang.org/install.sh" "install.sh"
 
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash install.sh dmd-$HOST_DMD_VER --activate)"
     $DC --version
@@ -51,37 +60,58 @@ clone() {
     done
 }
 
-coverage() {
+setup_repos() {
+    # set a default in case we run into rate limit restrictions
+    local base_branch=""
     if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
-        local base_branch=$(curl -fsSL https://api.github.com/repos/dlang/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER | jq -r '.base.ref')
+        base_branch=$((curl -fsSL https://api.github.com/repos/dlang/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER || echo) | jq -r '.base.ref')
     else
-        local base_branch=$CIRCLE_BRANCH
+        base_branch=$CIRCLE_BRANCH
     fi
+    base_branch=${base_branch:-"master"}
 
    # merge upstream branch with changes, s.t. we check with the latest changes
     if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
-        local current_branch=$(git rev-parse --abbrev-ref HEAD)
-        git config user.name dummyuser
-        git config user.email dummyuser@dummyserver.com
-        git remote add upstream https://github.com/dlang/druntime.git
-        git fetch upstream
-        git checkout -f upstream/$base_branch
-        git merge -m "Automatic merge" $current_branch
+        local head=$(git rev-parse HEAD)
+        git fetch https://github.com/dlang/$CIRCLE_PROJECT_REPONAME.git $base_branch
+        git checkout -f FETCH_HEAD
+        local base=$(git rev-parse HEAD)
+        git config user.name 'CI'
+        git config user.email '<>'
+        git merge -m "Merge $head into $base" $head
     fi
 
+    for proj in dmd ; do
+        if [ $base_branch != master ] && [ $base_branch != stable ] &&
+            ! git ls-remote --exit-code --heads https://github.com/dlang/$proj.git $base_branch > /dev/null; then
+            # use master as fallback for other repos to test feature branches
+            clone https://github.com/dlang/$proj.git ../$proj master --depth 1
+        else
+            clone https://github.com/dlang/$proj.git ../$proj $base_branch --depth 1
+        fi
+    done
+}
 
-    clone https://github.com/dlang/dmd.git ../dmd $base_branch --depth 1
-
+coverage() {
     # load environment for bootstrap compiler
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
 
     # build dmd and druntime
     make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD all
-    make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD dmd.conf
     TEST_COVERAGE="1" make -j$N -C . -f posix.mak MODEL=$MODEL unittest-debug
 }
 
+codecov()
+{
+    # CodeCov gets confused by lst files which it can't matched
+    rm -rf test/runnable/extra-files
+    download "https://codecov.io/bash" "https://raw.githubusercontent.com/codecov/codecov-bash/master/codecov" "codecov.sh"
+    bash codecov.sh
+}
+
 case $1 in
     install-deps) install_deps ;;
+    setup-repos) setup_repos ;;
     coverage) coverage ;;
+    codecov) codecov ;;
 esac

mak/COPY

@@ -95,6 +95,7 @@ COPY=\
 	$(IMPDIR)\core\sys\linux\unistd.d \
 	\
 	$(IMPDIR)\core\sys\linux\sys\auxv.d \
+	$(IMPDIR)\core\sys\linux\sys\file.d \
 	$(IMPDIR)\core\sys\linux\sys\inotify.d \
 	$(IMPDIR)\core\sys\linux\sys\mman.d \
 	$(IMPDIR)\core\sys\linux\sys\netinet\tcp.d \

mak/SRCS

@@ -305,7 +305,6 @@ SRCS=\
 	src\rt\util\container\hashtab.d \
 	src\rt\util\container\treap.d \
 	\
-	src\rt\typeinfo\ti_AC.d \
 	src\rt\typeinfo\ti_Acdouble.d \
 	src\rt\typeinfo\ti_Acfloat.d \
 	src\rt\typeinfo\ti_Acreal.d \

osmodel.mak

@@ -15,6 +15,9 @@ ifeq (,$(OS))
   ifeq (OpenBSD,$(uname_S))
     OS:=openbsd
   endif
+  ifeq (NetBSD,$(uname_S))
+    OS:=netbsd
+  endif
   ifeq (Solaris,$(uname_S))
     OS:=solaris
   endif

posix.mak

@@ -21,7 +21,7 @@ ifneq ($(BUILD),release)
     endif
 endif
 
-DMD=../dmd/src/dmd
+DMD=../dmd/generated/$(OS)/release/$(MODEL)/dmd
 INSTALL_DIR=../install
 
 DOCDIR=doc
@@ -53,7 +53,7 @@ ifeq (solaris,$(OS))
 endif
 
 # Set DFLAGS
-UDFLAGS:=-conf= -Isrc -Iimport -w -dip25 $(MODEL_FLAG) $(OPTIONAL_PIC) $(OPTIONAL_COVERAGE)
+UDFLAGS:=-conf= -Isrc -Iimport -w -dip1000 $(MODEL_FLAG) $(OPTIONAL_PIC) $(OPTIONAL_COVERAGE)
 ifeq ($(BUILD),debug)
 	UDFLAGS += -g -debug
 	DFLAGS:=$(UDFLAGS)
@@ -197,7 +197,7 @@ $(DRUNTIME): $(OBJS) $(SRCS)
 UT_MODULES:=$(patsubst src/%.d,$(ROOT)/unittest/%,$(SRCS))
 HAS_ADDITIONAL_TESTS:=$(shell test -d test && echo 1)
 ifeq ($(HAS_ADDITIONAL_TESTS),1)
-	ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles
+	ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations test/typeinfo
 	ADDITIONAL_TESTS+=$(if $(SHARED),test/shared,)
 endif
 

src/core/demangle.d

@@ -876,6 +876,8 @@ private struct Demangle
         FuncAttrNothrow
         FuncAttrProperty
         FuncAttrRef
+        FuncAttrReturn
+        FuncAttrScope
         FuncAttrTrusted
         FuncAttrSafe
 
@@ -903,6 +905,9 @@ private struct Demangle
     FuncAttrReturn:
         Nj
 
+    FuncAttrScope:
+        Nl
+
     Arguments:
         Argument
         Argument Arguments
@@ -955,7 +960,7 @@ private struct Demangle
     {
         // FuncAttrs
         breakFuncAttrs:
-        while( 'N' == front )
+        while ('N' == front)
         {
             popFront();
             switch( front )
@@ -1003,6 +1008,10 @@ private struct Demangle
                 popFront();
                 put( "return " );
                 continue;
+            case 'l': // FuncAttrScope
+                popFront();
+                put( "scope " );
+                continue;
             default:
                 error();
             }
@@ -1963,6 +1972,10 @@ version(unittest)
         ["_D8link657429__T3fooHVE8link65746Methodi0Z3fooFZi", "int link6574.foo!(0).foo()"],
         ["_D4test22__T4funcVAyaa3_610a62Z4funcFNaNbNiNfZAya", `pure nothrow @nogc @safe immutable(char)[] test.func!("a\x0ab").func()`],
         ["_D3foo3barFzkZzi", "cent foo.bar(ucent)"],
+        ["_D5bug145Class3fooMFNlZPv", "scope void* bug14.Class.foo()"],
+        ["_D5bug145Class3barMFNjZPv", "return void* bug14.Class.bar()"],
+        ["_D5bug143fooFMPvZPv", "void* bug14.foo(scope void*)"],
+        ["_D5bug143barFMNkPvZPv", "void* bug14.bar(scope return void*)"],
     ];
 
     template staticIota(int x)

src/core/exception.d

@@ -621,9 +621,10 @@ extern (C)
 
     /* One of these three is called upon an assert() fail.
      */
-    void _d_assertm(immutable(ModuleInfo)* m, uint line)
+    void _d_assertp(immutable(char)* file, uint line)
     {
-        onAssertError(m.name, line);
+        import core.stdc.string : strlen;
+        onAssertError(file[0 .. strlen(file)], line);
     }
 
     void _d_assert_msg(string msg, string file, uint line)
@@ -638,9 +639,10 @@ extern (C)
 
     /* One of these three is called upon an assert() fail inside of a unittest block
      */
-    void _d_unittestm(immutable(ModuleInfo)* m, uint line)
+    void _d_unittestp(immutable(char)* file, uint line)
     {
-        _d_unittest(m.name, line);
+        import core.stdc.string : strlen;
+        _d_unittest(file[0 .. strlen(file)], line);
     }
 
     void _d_unittest_msg(string msg, string file, uint line)
@@ -655,9 +657,10 @@ extern (C)
 
     /* Called when an array index is out of bounds
      */
-    void _d_array_bounds(immutable(ModuleInfo)* m, uint line)
+    void _d_arrayboundsp(immutable(char*) file, uint line)
     {
-        onRangeError(m.name, line);
+        import core.stdc.string : strlen;
+        onRangeError(file[0 .. strlen(file)], line);
     }
 
     void _d_arraybounds(string file, uint line)