Merge branch 'master' into release-0.15.2

Author: redstar

.travis.yml

@@ -7,9 +7,10 @@ before_install:
   # the official Clang binary package from the llvm.org download page.
   - echo yes | sudo add-apt-repository ppa:h-rayflood/llvm
 
-  # LLVM 3.4 / 3.5 / snapshots
+  # LLVM 3.4 / 3.5 / 3.6 / snapshots
   - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main' >> /etc/apt/sources.list"
   - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main' >> /etc/apt/sources.list"
+  - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6-binaries main' >> /etc/apt/sources.list"
   - sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
   - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
 
@@ -31,11 +32,11 @@ install:
       sudo ln -s /usr/lib/i386-linux-gnu/libstdc++.so.6 /usr/lib/i386-linux-gnu/libstdc++.so;
     fi
   -
-    if [[ "${LLVM_PACKAGE}" == *3\.[56]* ]] && [[ "${CXX}" == "g++" ]]; then
-      sudo apt-get install -qq g++-4.8; export CXX="g++-4.8";
+    if [[ "${LLVM_PACKAGE}" == *3\.[567]* ]] && [[ "${CXX}" == "g++" ]]; then
+      sudo apt-get install -qq g++-4.9; export CXX="g++-4.9";
     fi
   -
-    if [[ "${LLVM_PACKAGE}" == *3\.[56]* ]] && [[ "${CXX}" == "clang++" ]]; then
+    if [[ "${LLVM_PACKAGE}" == *3\.[567]* ]] && [[ "${CXX}" == "clang++" ]]; then
       sudo apt-get install --allow-unauthenticated -qq clang-3.4; export CXX="clang++-3.4";
     fi
 env:
@@ -52,10 +53,14 @@ env:
   - LLVM_PACKAGE="llvm-3.5 llvm-3.5-dev libedit2 libedit-dev"
   - LLVM_PACKAGE="llvm-3.6 llvm-3.6-dev libedit2 libedit-dev" TEST_DEBUG=1
   - LLVM_PACKAGE="llvm-3.6 llvm-3.6-dev libedit2 libedit-dev"
+  - LLVM_PACKAGE="llvm-3.7 llvm-3.7-dev libedit2 libedit-dev" TEST_DEBUG=1
+  - LLVM_PACKAGE="llvm-3.7 llvm-3.7-dev libedit2 libedit-dev"
 matrix:
   allow_failures:
   - env: LLVM_PACKAGE="llvm-3.6 llvm-3.6-dev libedit2 libedit-dev" TEST_DEBUG=1
   - env: LLVM_PACKAGE="llvm-3.6 llvm-3.6-dev libedit2 libedit-dev"
+  - env: LLVM_PACKAGE="llvm-3.7 llvm-3.7-dev libedit2 libedit-dev" TEST_DEBUG=1
+  - env: LLVM_PACKAGE="llvm-3.7 llvm-3.7-dev libedit2 libedit-dev"
 script:
   - cmake $OPTS .
   - make -j2

CMakeLists.txt

@@ -16,7 +16,7 @@ include(CheckCXXCompilerFlag)
 #
 
 find_package(LLVM 3.1 REQUIRED
-    all-targets analysis asmparser asmprinter bitreader bitwriter codegen core debuginfo instcombine ipa ipo instrumentation linker lto mc mcdisassembler mcparser objcarcopts object option profiledata scalaropts selectiondag support tablegen target transformutils vectorize ${EXTRA_LLVM_MODULES})
+    all-targets analysis asmparser asmprinter bitreader bitwriter codegen core debuginfodwarf instcombine ipa ipo instrumentation linker lto mc mcdisassembler mcparser objcarcopts object option profiledata scalaropts selectiondag support tablegen target transformutils vectorize ${EXTRA_LLVM_MODULES})
 math(EXPR LDC_LLVM_VER ${LLVM_VERSION_MAJOR}*100+${LLVM_VERSION_MINOR})
 
 #
@@ -34,7 +34,7 @@ include(GetLinuxDistribution)
 #
 
 # Version information
-set(LDC_VERSION "0.15.0") # May be overridden by git hash tag
+set(LDC_VERSION "0.15.2") # May be overridden by git hash tag
 set(DMDFE_MAJOR_VERSION   2)
 set(DMDFE_MINOR_VERSION   0)
 set(DMDFE_PATCH_VERSION   66)
@@ -513,11 +513,14 @@ endif()
 install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}_install.conf DESTINATION ${CONF_INST_DIR} RENAME ${LDC_EXE}.conf)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set(BASH_COMPLETION_INST_DIR "${CONF_INST_DIR}/bash_completion.d")
-    if(LINUX_DISTRIBUTION_IS_GENTOO)
-        set(BASH_COMPLETION_INST_DIR "/usr/share/bash-completion")
+    find_package(bash-completion QUIET)
+    if(NOT BASH_COMPLETION_FOUND)
+        set(BASH_COMPLETION_COMPLETIONSDIR "${CONF_INST_DIR}/bash_completion.d")
+        if(LINUX_DISTRIBUTION_IS_GENTOO)
+            set(BASH_COMPLETION_COMPLETIONSDIR "/usr/share/bash-completion")
+        endif()
     endif()
-    install(DIRECTORY bash_completion.d/ DESTINATION ${BASH_COMPLETION_INST_DIR})
+    install(DIRECTORY bash_completion.d/ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR})
 endif()
 
 #

Doxyfile

@@ -1,6 +1,5 @@
 # bash completion for ldc2
 
-have ldc2 &&{
     function elementExists(){
         local i isRunning result
         i=0
@@ -160,7 +159,6 @@ have ldc2 &&{
         fi
     }
     complete -o nospace -F _ldc ldc2
-}
 
 # Local variables:
 # mode: shell-script

bash_completion.d/ldc renamed to bash_completion.d/ldc2

@@ -27,7 +27,8 @@
 # We also want an user-specified LLVM_ROOT_DIR to take precedence over the
 # system default locations such as /usr/local/bin. Executing find_program()
 # multiples times is the approach recommended in the docs.
-set(llvm_config_names llvm-config-3.6 llvm-config36
+set(llvm_config_names llvm-config-3.7 llvm-config37
+                      llvm-config-3.6 llvm-config36
                       llvm-config-3.5 llvm-config35
                       llvm-config-3.4 llvm-config34
                       llvm-config-3.3 llvm-config33
@@ -76,6 +77,12 @@ if ((WIN32 AND NOT(MINGW OR CYGWIN)) OR NOT LLVM_CONFIG)
             list(REMOVE_ITEM LLVM_FIND_COMPONENTS "lto" index)
             list(REMOVE_ITEM LLVM_FIND_COMPONENTS "profiledata" index)
         endif()
+        if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-6][\\.0-9A-Za-z]*")
+            # Versions below 3.7 do not support components debuginfodwarf
+            # Only debuginfo is available
+            list(REMOVE_ITEM LLVM_FIND_COMPONENTS "debuginfodwarf" index)
+            list(APPEND LLVM_FIND_COMPONENTS "debuginfo")
+        endif()
 
         if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")
             llvm_map_components_to_libraries(tmplibs ${LLVM_FIND_COMPONENTS})
@@ -150,6 +157,12 @@ else()
         list(REMOVE_ITEM LLVM_FIND_COMPONENTS "lto" index)
         list(REMOVE_ITEM LLVM_FIND_COMPONENTS "profiledata" index)
     endif()
+    if(${LLVM_VERSION_STRING} MATCHES "^3\\.[0-6][\\.0-9A-Za-z]*")
+        # Versions below 3.7 do not support components debuginfodwarf
+        # Only debuginfo is available
+        list(REMOVE_ITEM LLVM_FIND_COMPONENTS "debuginfodwarf" index)
+        list(APPEND LLVM_FIND_COMPONENTS "debuginfo")
+    endif()
 
     llvm_set(LDFLAGS ldflags)
     if(NOT ${LLVM_VERSION_STRING} MATCHES "^3\\.[0-4][\\.0-9A-Za-z]*")

cmake/Modules/FindLLVM.cmake

@@ -217,6 +217,9 @@ void Type::init()
     sizeTy[Treturn] = sizeof(TypeReturn);
     sizeTy[Terror] = sizeof(TypeError);
     sizeTy[Tnull] = sizeof(TypeNull);
+#if IN_LLVM  // Backport from DMD 2.067, pull request #4436
+    sizeTy[Tvector] = sizeof(TypeVector);
+#endif
 
     mangleChar[Tarray] = 'A';
     mangleChar[Tsarray] = 'G';

dmd2/mtype.c

@@ -147,6 +147,8 @@ longdouble Port::strtold(const char *buffer, char **endp)
 // Disable useless warnings about unreferenced functions
 #pragma warning (disable : 4514)
 
+#include <llvm/ADT/APFloat.h>
+#include <llvm/ADT/StringRef.h>
 #include <math.h>
 #include <float.h>  // for _isnan
 #include <time.h>
@@ -285,7 +287,11 @@ longdouble strtold_dm(const char *p,char **endp);
 longdouble Port::strtold(const char *p, char **endp)
 {
 #if IN_LLVM
-    return ::strtold(p, endp);
+    // MSVC strtold() does not support hex float strings. Just use
+    // the function provided by LLVM because we going to use it anyway.
+    llvm::APFloat val(llvm::APFloat::IEEEdouble, llvm::APFloat::uninitialized);
+    val.convertFromString(llvm::StringRef(p), llvm::APFloat::rmNearestTiesToEven);
+    return val.convertToDouble();
 #else
     return ::strtold_dm(p, endp);
 #endif

dmd2/root/port.c

@@ -945,7 +945,7 @@ void buildCommandLine(std::vector<const char*>& r, const Params& p)
     else if (p.debugInfo == Debug::pretendC) r.push_back("-gc");
     if (p.alwaysStackFrame) r.push_back("-disable-fp-elim");
     if (p.targetModel == Model::m32) r.push_back("-m32");
-    else if (p.targetModel == Model::m32) r.push_back("-m64");
+    else if (p.targetModel == Model::m64) r.push_back("-m64");
     if (p.profile) warning("CPU profile generation not yet supported by LDC.");
     if (p.verbose) r.push_back("-v");
     if (p.logTlsUse) warning("-vtls not yet supported by LDC.");

driver/ldmd.cpp

@@ -190,8 +190,12 @@ static void hide(llvm::StringMap<cl::Option *>& map, const char* name) {
 /// Removes command line options exposed from within LLVM that are unlikely
 /// to be useful for end users from the -help output.
 static void hideLLVMOptions() {
+#if LDC_LLVM_VER >= 307
+    llvm::StringMap<cl::Option *>& map = cl::getRegisteredOptions();
+#else
     llvm::StringMap<cl::Option *> map;
     cl::getRegisteredOptions(map);
+#endif
     hide(map, "bounds-checking-single-trap");
     hide(map, "disable-debug-info-verifier");
     hide(map, "disable-spill-fusing");
@@ -550,18 +554,25 @@ static void registerMipsABI()
 }
 
 /// Register the float ABI.
-/// Also defines D_SoftFloat or D_HardFloat depending on ABI type.
-static void registerPredefinedFloatABI(const char *soft, const char *hard)
+/// Also defines D_HardFloat or D_SoftFloat depending if FPU should be used
+static void registerPredefinedFloatABI(const char *soft, const char *hard, const char *softfp=NULL)
 {
+    // Use target floating point unit instead of s/w float routines
+    bool useFPU = !gTargetMachine->Options.UseSoftFloat;
+    VersionCondition::addPredefinedGlobalIdent(useFPU ? "D_HardFloat" : "D_SoftFloat");
+
     if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Soft)
     {
-        VersionCondition::addPredefinedGlobalIdent(soft);
-        VersionCondition::addPredefinedGlobalIdent("D_SoftFloat");
+        VersionCondition::addPredefinedGlobalIdent(useFPU && softfp ? softfp : soft);
     }
-    if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Hard)
+    else if (gTargetMachine->Options.FloatABIType == llvm::FloatABI::Hard)
     {
+        assert(useFPU && "Should be using the FPU if using float-abi=hard");
         VersionCondition::addPredefinedGlobalIdent(hard);
-        VersionCondition::addPredefinedGlobalIdent("D_HardFloat");
+    }
+    else
+    {
+        assert(0 && "FloatABIType neither Soft or Hard");
     }
 }
 
@@ -603,14 +614,13 @@ static void registerPredefinedTargetVersions() {
         case llvm::Triple::armeb:
 #endif
             VersionCondition::addPredefinedGlobalIdent("ARM");
-            // FIXME: What about ARM_SoftFP?.
-            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat");
+            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
             break;
         case llvm::Triple::thumb:
             VersionCondition::addPredefinedGlobalIdent("ARM");
             VersionCondition::addPredefinedGlobalIdent("Thumb"); // For backwards compatibility.
             VersionCondition::addPredefinedGlobalIdent("ARM_Thumb");
-            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat");
+            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
             break;
 #if LDC_LLVM_VER == 305
         case llvm::Triple::arm64:
@@ -622,7 +632,7 @@ static void registerPredefinedTargetVersions() {
         case llvm::Triple::aarch64_be:
 #endif
             VersionCondition::addPredefinedGlobalIdent("AArch64");
-            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat");
+            registerPredefinedFloatABI("ARM_SoftFloat", "ARM_HardFloat", "ARM_SoftFP");
             break;
 #endif
         case llvm::Triple::mips:
@@ -989,9 +999,8 @@ int main(int argc, char **argv)
     if (m64bits)
     {
         if (bitness != ExplicitBitness::None)
-        {
             error(Loc(), "cannot use both -m32 and -m64 options");
-        }
+        bitness = ExplicitBitness::M64;
     }
 
     if (global.errors)
@@ -1015,7 +1024,9 @@ int main(int argc, char **argv)
         global.params.is64bit      = triple.isArch64Bit();
     }
 
-#if LDC_LLVM_VER >= 306
+#if LDC_LLVM_VER >= 307
+    gDataLayout = gTargetMachine->getDataLayout();
+#elif LDC_LLVM_VER >= 306
     gDataLayout = gTargetMachine->getSubtargetImpl()->getDataLayout();
 #elif LDC_LLVM_VER >= 302
     gDataLayout = gTargetMachine->getDataLayout();
@@ -1212,7 +1223,7 @@ int main(int argc, char **argv)
         if (strcmp(m->srcfile->name->str, global.main_d) == 0)
         {
             static const char buf[] = "void main(){}";
-            m->srcfile->setbuffer((void *)buf, sizeof(buf));
+            m->srcfile->setbuffer(const_cast<char *>(buf), sizeof(buf));
             m->srcfile->ref = 1;
         }
         else

driver/main.cpp

@@ -390,10 +390,8 @@ llvm::TargetMachine* createTargetMachine(
             floatABI = FloatABI::Hard;
             break;
         case llvm::Triple::arm:
-            floatABI = getARMFloatABI(triple, getLLVMArchSuffixForARM(cpu));
-            break;
         case llvm::Triple::thumb:
-            floatABI = FloatABI::Soft;
+            floatABI = getARMFloatABI(triple, getLLVMArchSuffixForARM(cpu));
             break;
         }
     }