Upgrade to D v2.081.0

.circleci/config.yml

@@ -264,9 +264,9 @@ jobs:
     environment:
       - CI_OS: linux
       - LLVM_VERSION: 6.0.0
-      - HOST_LDC_VERSION: 1.8.0
+      - HOST_LDC_VERSION: 1.10.0
       - EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DBUILD_LTO_LIBS=ON -DD_FLAGS='-w;-flto=thin' -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++ -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON"
-      - DUB_VERSION: v1.8.1
+      - DUB_VERSION: v1.9.0
   build-osx:
     <<: *commonSteps
     macos:
@@ -276,10 +276,10 @@ jobs:
       - MACOSX_DEPLOYMENT_TARGET: 10.8
       - USE_LIBCPP: true
       - LLVM_VERSION: 6.0.0
-      - HOST_LDC_VERSION: 1.8.0
+      - HOST_LDC_VERSION: 1.10.0
       - BOOTSTRAP_CMAKE_FLAGS: "-DCMAKE_CXX_FLAGS='-stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS=-lc++"
       - EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DBUILD_LTO_LIBS=ON -DD_FLAGS='-w;-flto=thin' -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS=-lc++"
-      - DUB_VERSION: v1.8.1
+      - DUB_VERSION: v1.9.0
 
 workflows:
   version: 2

CMakeLists.txt

@@ -62,11 +62,11 @@ endfunction()
 #
 
 # Version information
-set(LDC_VERSION "1.10.0") # May be overridden by git hash tag
+set(LDC_VERSION "1.11.0") # May be overridden by git hash tag
 set(DMDFE_MAJOR_VERSION   2)
 set(DMDFE_MINOR_VERSION   0)
-set(DMDFE_PATCH_VERSION   80)
-set(DMDFE_FIX_LEVEL       1) # Comment out if not used
+set(DMDFE_PATCH_VERSION   81)
+set(DMDFE_FIX_LEVEL       0) # Comment out if not used
 
 set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}${DMDFE_PATCH_VERSION})
 if(DEFINED DMDFE_FIX_LEVEL)

appveyor.yml

@@ -13,13 +13,13 @@ environment:
     - APPVEYOR_JOB_ARCH:           x64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       LLVM_VERSION:                6.0.0
-      HOST_LDC_VERSION:            1.8.0
-      DUB_VERSION:                 v1.8.1
+      HOST_LDC_VERSION:            1.10.0
+      DUB_VERSION:                 v1.9.0
     - APPVEYOR_JOB_ARCH:           x86
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       LLVM_VERSION:                5.0.1
-      HOST_LDC_VERSION:            1.8.0
-      DUB_VERSION:                 v1.8.1
+      HOST_LDC_VERSION:            1.10.0
+      DUB_VERSION:                 v1.9.0
 
 # scripts that are called at very beginning, before repo cloning
 init:

dmd/access.d

@@ -543,7 +543,7 @@ extern (C++) bool checkSymbolAccess(Scope *sc, Dsymbol s)
  * but doesn't recurse nor resolve aliases because protection/visibility is an
  * attribute of the alias not the aliasee.
  */
-public Dsymbol mostVisibleOverload(Dsymbol s)
+public Dsymbol mostVisibleOverload(Dsymbol s, Module mod = null)
 {
     if (!s.isOverloadable())
         return s;
@@ -612,7 +612,24 @@ public Dsymbol mostVisibleOverload(Dsymbol s)
         else
             break;
 
-        if (next && mostVisible.prot().isMoreRestrictiveThan(next.prot()))
+        /**
+        * Return the "effective" protection attribute of a symbol when accessed in a module.
+        * The effective protection attribute is the same as the regular protection attribute,
+        * except package() is "private" if the module is outside the package;
+        * otherwise, "public".
+        */
+        static Prot protectionSeenFromModule(Dsymbol d, Module mod = null)
+        {
+            Prot prot = d.prot();
+            if (mod && prot.kind == Prot.Kind.package_)
+            {
+                return hasPackageAccess(mod, d) ? Prot(Prot.Kind.public_) : Prot(Prot.Kind.private_);
+            }
+            return prot;
+        }
+
+        if (next &&
+            protectionSeenFromModule(mostVisible, mod).isMoreRestrictiveThan(protectionSeenFromModule(next, mod)))
             mostVisible = next;
     }
     return mostVisible;

dmd/aggregate.d

@@ -50,6 +50,22 @@ enum Baseok : int
     semanticdone,     // all base classes semantic done
 }
 
+/**
+ * The ClassKind enum is used in AggregateDeclaration AST nodes to
+ * specify the linkage type of the struct/class/interface or if it
+ * is an anonymous class. If the class is anonymous it is also
+ * considered to be a D class.
+ */
+enum ClassKind : int
+{
+    /// the aggregate is a d(efault) class
+    d,
+    /// the aggregate is a C++ struct/class/interface
+    cpp,
+    /// the aggregate is an Objective-C class/interface
+    objc,
+}
+
 /***********************************************************
  */
 extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
@@ -64,6 +80,9 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
     Dsymbol deferred;       // any deferred semantic2() or semantic3() symbol
     bool isdeprecated;      // true if deprecated
 
+    /// specifies whether this is a D, C++, Objective-C or anonymous struct/class/interface
+    ClassKind classKind;
+
     /* !=null if is nested
      * pointing to the dsymbol that directly enclosing it.
      * 1. The function that enclosing it (nested struct and class)
@@ -91,8 +110,10 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
     Dsymbol aliasthis;      // forward unresolved lookups to aliasthis
     bool noDefaultCtor;     // no default construction
 
-    FuncDeclarations dtors; // Array of destructors
-    FuncDeclaration dtor;   // aggregate destructor
+    DtorDeclarations dtors; // Array of destructors
+    DtorDeclaration dtor;   // aggregate destructor
+    DtorDeclaration primaryDtor; // non-deleting C++ destructor, same as dtor for D
+    DtorDeclaration tidtor; // aggregate destructor used in TypeInfo (must have extern(D) ABI)
 
     Expression getRTInfo;   // pointer to GC info generated by object.RTInfo(this)
 

dmd/aggregate.h

@@ -72,9 +72,19 @@ FuncDeclaration *buildXopEquals(StructDeclaration *sd, Scope *sc);
 FuncDeclaration *buildXopCmp(StructDeclaration *sd, Scope *sc);
 FuncDeclaration *buildXtoHash(StructDeclaration *ad, Scope *sc);
 FuncDeclaration *buildPostBlit(StructDeclaration *sd, Scope *sc);
-FuncDeclaration *buildDtor(AggregateDeclaration *ad, Scope *sc);
+DtorDeclaration *buildDtor(AggregateDeclaration *ad, Scope *sc);
 FuncDeclaration *buildInv(AggregateDeclaration *ad, Scope *sc);
 
+enum ClassKind
+{
+    /// the aggregate is a d(efault) struct/class/interface
+    d,
+    /// the aggregate is a C++ struct/class/interface
+    cpp,
+    /// the aggregate is an Objective-C class/interface
+    objc
+};
+
 class AggregateDeclaration : public ScopeDsymbol
 {
 public:
@@ -88,6 +98,8 @@ class AggregateDeclaration : public ScopeDsymbol
     Dsymbol *deferred;          // any deferred semantic2() or semantic3() symbol
     bool isdeprecated;          // true if deprecated
 
+    ClassKind classKind;        // specifies the linkage type
+
     /* !=NULL if is nested
      * pointing to the dsymbol that directly enclosing it.
      * 1. The function that enclosing it (nested struct and class)
@@ -112,8 +124,10 @@ class AggregateDeclaration : public ScopeDsymbol
     Dsymbol *aliasthis;         // forward unresolved lookups to aliasthis
     bool noDefaultCtor;         // no default construction
 
-    FuncDeclarations dtors;     // Array of destructors
-    FuncDeclaration *dtor;      // aggregate destructor
+    DtorDeclarations dtors;     // Array of destructors
+    DtorDeclaration *dtor;      // aggregate destructor
+    DtorDeclaration *primaryDtor; // non-deleting C++ destructor, same as dtor for D
+    DtorDeclaration *tidtor;    // aggregate destructor used in TypeInfo (must have extern(D) ABI)
 
     Expression *getRTInfo;      // pointer to GC info generated by object.RTInfo(this)
 
@@ -246,16 +260,6 @@ struct ClassFlags
     };
 };
 
-enum ClassKind
-{
-    /// the class is a d(efault) class
-    d,
-    /// the class is a C++ interface
-    cpp,
-    /// the class is an Objective-C class/interface
-    objc
-};
-
 class ClassDeclaration : public AggregateDeclaration
 {
 public:
@@ -283,7 +287,7 @@ class ClassDeclaration : public AggregateDeclaration
     TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
     bool com;                           // true if this is a COM class (meaning it derives from IUnknown)
     bool stack;                         // true if this is a scope class
-    ClassKind classKind;                // specifies the linkage type
+    int cppDtorVtblIndex;               // slot reserved for the virtual destructor [extern(C++)]
     bool inuse;                         // to prevent recursive attempts
     bool isActuallyAnonymous;           // true if this class has an identifier, but was originally declared anonymous
                                         // used in support of https://issues.dlang.org/show_bug.cgi?id=17371
@@ -320,7 +324,8 @@ class ClassDeclaration : public AggregateDeclaration
     void addLocalClass(ClassDeclarations *);
 
     // Back end
-    Symbol *vtblsym;
+    Dsymbol *vtblsym;
+    Dsymbol *vtblSymbol();
 
     ClassDeclaration *isClassDeclaration() { return (ClassDeclaration *)this; }
     void accept(Visitor *v) { v->visit(this); }

dmd/apply.d

@@ -29,7 +29,7 @@ import dmd.visitor;
  */
 private extern (C++) final class PostorderExpressionVisitor : StoppableVisitor
 {
-    alias visit = super.visit;
+    alias visit = typeof(super).visit;
 public:
     StoppableVisitor v;
 

dmd/arraytypes.d

@@ -35,6 +35,7 @@ alias BaseClasses = Array!(BaseClass*);
 alias ClassDeclarations = Array!(ClassDeclaration);
 alias Dsymbols = Array!(Dsymbol);
 alias Objects = Array!(RootObject);
+alias DtorDeclarations = Array!(DtorDeclaration);
 alias FuncDeclarations = Array!(FuncDeclaration);
 alias Parameters = Array!(Parameter);
 alias Initializers = Array!(Initializer);
@@ -51,3 +52,4 @@ alias GotoCaseStatements = Array!(GotoCaseStatement);
 alias ReturnStatements = Array!(ReturnStatement);
 alias GotoStatements = Array!(GotoStatement);
 alias TemplateInstances = Array!(TemplateInstance);
+alias Ensures = Array!(Ensure);

dmd/arraytypes.h

@@ -32,6 +32,8 @@ typedef Array<class Dsymbol *> Dsymbols;
 
 typedef Array<class RootObject *> Objects;
 
+typedef Array<class DtorDeclaration *> DtorDeclarations;
+
 typedef Array<class FuncDeclaration *> FuncDeclarations;
 
 typedef Array<class Parameter *> Parameters;
@@ -67,4 +69,6 @@ typedef Array<class GotoStatement *> GotoStatements;
 
 typedef Array<class TemplateInstance *> TemplateInstances;
 
+typedef Array<struct Ensure> Ensures;
+
 #endif

dmd/astcodegen.d

@@ -37,6 +37,7 @@ struct ASTCodegen
     alias initializerToExpression   = dmd.initsem.initializerToExpression;
     alias typeToExpression          = dmd.typesem.typeToExpression;
     alias UserAttributeDeclaration  = dmd.attrib.UserAttributeDeclaration;
+    alias Ensure                    = dmd.func.Ensure; // workaround for bug in older DMD frontends
 
     alias MODFlags                  = dmd.mtype.MODFlags;
     alias Type                      = dmd.mtype.Type;

dmd/canthrow.d

@@ -39,7 +39,7 @@ extern (C++) bool canThrow(Expression e, FuncDeclaration func, bool mustNotThrow
     // stop walking if we determine this expression can throw
     extern (C++) final class CanThrow : StoppableVisitor
     {
-        alias visit = super.visit;
+        alias visit = typeof(super).visit;
         FuncDeclaration func;
         bool mustNotThrow;