[dmd-internals] [D-Programming-Language/dmd] 44959a: Merge remote-tracking branch 'upstream/master' int...

GitHub via dmd-internals dmd-internals at puremagic.com
Tue Oct 6 19:56:27 PDT 2015


  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 44959a14a0b8d301b062e6f6c6d62fcff3e678e1
      https://github.com/D-Programming-Language/dmd/commit/44959a14a0b8d301b062e6f6c6d62fcff3e678e1
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M .gitignore
    M .travis.yml
    M VERSION
    M changelog.dd
    M ini/windows/bin/sc.ini
    M posix.mak
    M samples/listener.d
    R src/access.c
    A src/access.d
    A src/aggregate.d
    M src/aggregate.h
    R src/aliasthis.c
    A src/aliasthis.d
    R src/apply.c
    A src/apply.d
    R src/argtypes.c
    A src/argtypes.d
    R src/arrayop.c
    A src/arrayop.d
    A src/arraytypes.d
    M src/arraytypes.h
    R src/attrib.c
    A src/attrib.d
    M src/attrib.h
    M src/backend.d
    M src/backend/backconfig.c
    M src/backend/blockopt.c
    M src/backend/cc.h
    M src/backend/cdef.h
    M src/backend/cdeflnx.h
    M src/backend/cg87.c
    M src/backend/cgcod.c
    M src/backend/cgcs.c
    M src/backend/cgcv.c
    M src/backend/cgelem.c
    M src/backend/cgen.c
    M src/backend/cgobj.c
    M src/backend/cod1.c
    M src/backend/cod2.c
    M src/backend/cod3.c
    M src/backend/cod4.c
    M src/backend/cod5.c
    M src/backend/code.c
    M src/backend/code.h
    M src/backend/code_x86.h
    M src/backend/debug.c
    M src/backend/dt.c
    M src/backend/dt.h
    M src/backend/dwarf.c
    M src/backend/el.c
    M src/backend/el.h
    M src/backend/elfobj.c
    M src/backend/evalu8.c
    M src/backend/gdag.c
    M src/backend/gflow.c
    M src/backend/global.h
    M src/backend/glocal.c
    M src/backend/gloop.c
    M src/backend/go.c
    M src/backend/go.h
    M src/backend/gother.c
    M src/backend/machobj.c
    M src/backend/melf.h
    M src/backend/mscoff.h
    M src/backend/mscoffobj.c
    M src/backend/newman.c
    M src/backend/nteh.c
    M src/backend/obj.h
    M src/backend/oper.h
    M src/backend/optabgen.c
    M src/backend/out.c
    M src/backend/outbuf.c
    M src/backend/outbuf.h
    M src/backend/platform_stub.c
    M src/backend/rtlsym.c
    M src/backend/rtlsym.h
    M src/backend/strtold.c
    M src/backend/symbol.c
    M src/backend/ty.h
    M src/backend/type.c
    M src/backend/type.h
    M src/backend/var.c
    R src/builtin.c
    A src/builtin.d
    R src/canthrow.c
    A src/canthrow.d
    R src/cast.c
    M src/checkwhitespace.d
    R src/class.c
    R src/clone.c
    A src/clone.d
    R src/cond.c
    A src/cond.d
    R src/constfold.c
    A src/constfold.d
    R src/cppmangle.c
    A src/cppmangle.d
    M src/ctfe.h
    R src/ctfeexpr.c
    A src/ctfeexpr.d
    A src/dcast.d
    A src/dclass.d
    R src/declaration.c
    A src/declaration.d
    M src/declaration.h
    R src/delegatize.c
    A src/delegatize.d
    A src/denum.d
    A src/dimport.d
    A src/dinifile.d
    A src/dinterpret.d
    A src/dmacro.d
    A src/dmangle.d
    M src/dmd_msc.vcproj
    M src/dmd_msc.vcxproj
    M src/dmd_msc.vcxproj.filters
    A src/dmodule.d
    R src/doc.c
    A src/doc.d
    R src/doc.h
    A src/dscope.d
    A src/dstruct.d
    R src/dsymbol.c
    A src/dsymbol.d
    M src/dsymbol.h
    A src/dtemplate.d
    A src/dunittest.d
    A src/dversion.d
    M src/e2ir.c
    M src/eh.c
    R src/entity.c
    R src/enum.c
    M src/enum.h
    R src/errors.c
    A src/errors.d
    R src/escape.c
    A src/escape.d
    R src/expression.c
    A src/expression.d
    M src/expression.h
    R src/func.c
    A src/func.d
    R src/globals.c
    A src/globals.d
    M src/globals.h
    M src/glue.c
    R src/gluestub.c
    A src/gluestub.d
    R src/hdrgen.c
    A src/hdrgen.d
    M src/hdrgen.h
    M src/iasm.c
    R src/identifier.c
    A src/identifier.d
    M src/identifier.h
    M src/idgen.d
    R src/impcnvgen.c
    A src/impcnvtab.d
    R src/imphint.c
    A src/imphint.d
    R src/import.c
    R src/inifile.c
    R src/init.c
    A src/init.d
    R src/inline.c
    A src/inline.d
    R src/interpret.c
    R src/intrange.c
    R src/irstate.c
    A src/irstate.d
    M src/irstate.h
    R src/json.c
    A src/json.d
    R src/lexer.c
    A src/lexer.d
    R src/lexer.h
    A src/lib.d
    R src/libelf.c
    A src/libelf.d
    R src/libmach.c
    A src/libmach.d
    R src/libmscoff.c
    A src/libmscoff.d
    R src/libomf.c
    A src/libomf.d
    R src/link.c
    A src/link.d
    R src/macro.c
    R src/magicport.json
    R src/magicport/ast.d
    R src/magicport/dprinter.d
    R src/magicport/magicport2.d
    R src/magicport/namer.d
    R src/magicport/parser.d
    R src/magicport/scanner.d
    R src/magicport/tokens.d
    R src/magicport/typenames.d
    R src/magicport/visitor.d
    R src/mangle.c
    R src/mars.c
    A src/mars.d
    R src/module.c
    M src/module.h
    R src/mtype.c
    A src/mtype.d
    M src/mtype.h
    R src/nogc.c
    A src/nogc.d
    R src/nspace.c
    A src/nspace.d
    A src/objc.d
    A src/objc.h
    A src/objc_glue.c
    A src/objc_glue_stubs.c
    A src/objc_stubs.d
    R src/opover.c
    A src/opover.d
    R src/optimize.c
    A src/optimize.d
    R src/parse.c
    A src/parse.d
    R src/parse.h
    M src/posix.mak
    R src/root/aav.c
    A src/root/aav.d
    M src/root/array.d
    M src/root/array.h
    R src/root/async.c
    R src/root/async.h
    R src/root/checkedint.c
    R src/root/checkedint.h
    R src/root/file.c
    A src/root/file.d
    R src/root/filename.c
    A src/root/filename.d
    M src/root/longdouble.d
    M src/root/longdouble.h
    R src/root/man.c
    A src/root/man.d
    M src/root/newdelete.c
    R src/root/object.c
    R src/root/outbuffer.c
    A src/root/outbuffer.d
    R src/root/port.c
    M src/root/port.d
    R src/root/response.c
    A src/root/response.d
    R src/root/rmem.c
    M src/root/rmem.d
    M src/root/rmem.h
    M src/root/rootobject.d
    R src/root/speller.c
    A src/root/speller.d
    R src/root/speller.h
    R src/root/stringtable.c
    A src/root/stringtable.d
    M src/root/stringtable.h
    M src/s2ir.c
    R src/sapply.c
    A src/sapply.d
    R src/scanelf.c
    A src/scanelf.d
    R src/scanmach.c
    A src/scanmach.d
    R src/scanmscoff.c
    A src/scanmscoff.d
    R src/scanomf.c
    A src/scanomf.d
    R src/scope.c
    R src/sideeffect.c
    A src/sideeffect.d
    R src/statement.c
    A src/statement.d
    M src/statement.h
    R src/staticassert.c
    A src/staticassert.d
    R src/struct.c
    R src/target.c
    A src/target.d
    M src/target.h
    R src/template.c
    M src/template.h
    M src/tocsym.c
    R src/toctype.c
    A src/toctype.d
    M src/tocvdebug.c
    M src/todt.c
    R src/toelfdebug.c
    A src/toelfdebug.d
    M src/toir.c
    R src/tokens.c
    A src/tokens.d
    M src/toobj.c
    R src/traits.c
    A src/traits.d
    R src/typinf.c
    A src/typinf.d
    R src/unittests.c
    R src/utf.c
    A src/utf.d
    R src/version.c
    A src/visitor.d
    M src/win32.mak
    M test/Makefile
    M test/compilable/compile1.d
    A test/compilable/diag3243.d
    A test/compilable/exception.d
    A test/compilable/ice11300.d
    A test/compilable/ice13792.d
    A test/compilable/imports/ice11300a.d
    A test/compilable/objc_gfunc.d
    A test/compilable/objc_interface.d
    A test/compilable/test14747.d
    A test/compilable/test15019.d
    M test/d_do_test.d
    A test/fail_compilation/diag12487.d
    A test/fail_compilation/diag14818.d
    A test/fail_compilation/diag14875.d
    A test/fail_compilation/diag14876.d
    A test/fail_compilation/diag14950.d
    A test/fail_compilation/diag15001.d
    R test/fail_compilation/diag8629.d
    R test/fail_compilation/diag9241.d
    M test/fail_compilation/fail12436.d
    A test/fail_compilation/fail12744.d
    A test/fail_compilation/fail13203.d
    M test/fail_compilation/fail13939.d
    A test/fail_compilation/fail14669.d
    A test/fail_compilation/fail15089.d
    M test/fail_compilation/fail170.d
    M test/fail_compilation/fail179.d
    M test/fail_compilation/fail180.d
    M test/fail_compilation/fail4611.d
    M test/fail_compilation/fail7077.d
    A test/fail_compilation/fail9891.d
    A test/fail_compilation/failattr.d
    R test/fail_compilation/ice11300.d
    M test/fail_compilation/ice14844.d
    A test/fail_compilation/ice15127.d
    R test/fail_compilation/imports/ice11300a.d
    M test/fail_compilation/lexer2.d
    A test/fail_compilation/objc_interface1.d
    A test/fail_compilation/objc_interface2.d
    A test/fail_compilation/objc_interface3.d
    A test/fail_compilation/parse14745.d
    M test/fail_compilation/test8556.d
    M test/runnable/aliasthis.d
    M test/runnable/constfold.d
    A test/runnable/cpp_abi_tests.d
    M test/runnable/cppa.d
    R test/runnable/cppmangle1.d
    M test/runnable/dhry.d
    A test/runnable/extra-files/cpp_abi_tests.cpp
    M test/runnable/extra-files/cppb.cpp
    R test/runnable/extra-files/cppmangle1.cpp
    A test/runnable/extra-files/objc_objc_msgSend.m
    R test/runnable/extra-files/testzip-postscript.sh
    R test/runnable/extra-files/testzip.zip
    M test/runnable/foreach5.d
    M test/runnable/funclit.d
    M test/runnable/functype.d
    A test/runnable/imports/a15079.d
    M test/runnable/inline.d
    M test/runnable/interface2.d
    M test/runnable/interpret.d
    M test/runnable/mangle.d
    M test/runnable/mars1.d
    M test/runnable/nested.d
    A test/runnable/objc_call.d
    A test/runnable/objc_objc_msgSend.d
    M test/runnable/overload.d
    M test/runnable/sdtor.d
    M test/runnable/structlit.d
    M test/runnable/template9.d
    M test/runnable/test13117.d
    A test/runnable/test14874.d
    A test/runnable/test15079.d
    M test/runnable/test6423.d
    M test/runnable/testcontracts.d
    M test/runnable/testreturn.d
    M test/runnable/testscope2.d
    M test/runnable/testxmm.d
    R test/runnable/testzip.d
    M test/runnable/ufcs.d
    M test/runnable/xtest46.d
    A travis.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into stable


  Commit: 887557562ef3b16e404de8b1c964ba638cff5f83
      https://github.com/D-Programming-Language/dmd/commit/887557562ef3b16e404de8b1c964ba638cff5f83
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M src/denum.d

  Log Message:
  -----------
  Resurrect line spaces in denum.d


  Commit: 9e1e61d6e9d7713f8d64def9c468c0771bb6efff
      https://github.com/D-Programming-Language/dmd/commit/9e1e61d6e9d7713f8d64def9c468c0771bb6efff
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M src/declaration.d
    M src/denum.d
    M src/enum.h
    M src/iasm.c
    M src/json.d
    M src/mtype.d
    M src/tocvdebug.c
    M src/visitor.d
    M src/visitor.h
    A test/compilable/imports/test15150a.d
    A test/compilable/imports/test15150b.d
    A test/compilable/test15150.d
    M test/fail_compilation/fail10528.d

  Log Message:
  -----------
  fix Issue 15150 - Public selective import causes conflict

By making `EnumMember` to the subclass of `VarDeclaration`, the symbol itself can be representation of the enum member name.


  Commit: da933af18305462484925cf7032e29cb7daf1293
      https://github.com/D-Programming-Language/dmd/commit/da933af18305462484925cf7032e29cb7daf1293
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M src/dtemplate.d

  Log Message:
  -----------
  Ressurect line spaces in definitelyValueParameter


  Commit: 4d1b0864d25660fdd347146c4a19ad9ba878a3bb
      https://github.com/D-Programming-Language/dmd/commit/4d1b0864d25660fdd347146c4a19ad9ba878a3bb
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-05 (Mon, 05 Oct 2015)

  Changed paths:
    M src/mtype.d
    M test/runnable/template9.d

  Log Message:
  -----------
  fix Issue 15152 - template fails to instantiate if argument is itself a template


  Commit: f223530ec642a28f9152d10273837254e1ab6417
      https://github.com/D-Programming-Language/dmd/commit/f223530ec642a28f9152d10273837254e1ab6417
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M src/dtemplate.d
    A test/runnable/ice15138.d
    A test/runnable/imports/ice15138a.d

  Log Message:
  -----------
  fix Issue 15138 - ICE with basic use of stdx.data.json


  Commit: e13c2bc2c47ab4e1b0531895fa3c222e7cd0c09c
      https://github.com/D-Programming-Language/dmd/commit/e13c2bc2c47ab4e1b0531895fa3c222e7cd0c09c
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M src/dtemplate.d
    A test/runnable/ice15138.d
    A test/runnable/imports/ice15138a.d

  Log Message:
  -----------
  Merge pull request #5164 from 9rnsr/fix15138

[REG2.068.2] Issue 15138 - ICE with basic use of stdx.data.json


  Commit: 8830d971f730ff938b2628020f70b194c55854d2
      https://github.com/D-Programming-Language/dmd/commit/8830d971f730ff938b2628020f70b194c55854d2
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M src/dtemplate.d
    M src/mtype.d
    M test/runnable/template9.d

  Log Message:
  -----------
  Merge pull request #5163 from 9rnsr/fix15152

[REG2.069.0-devel] Issue 15152 - template fails to instantiate if argument is itself a template


  Commit: f9aa4c971b194a8b5246efb3361c0e23239c9fa5
      https://github.com/D-Programming-Language/dmd/commit/f9aa4c971b194a8b5246efb3361c0e23239c9fa5
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M src/doc.d
    M test/compilable/ddoc9.d
    M test/compilable/extra-files/ddoc9.html

  Log Message:
  -----------
  Keep backward compatibility of ddoc generation for template with anonymous enum


  Commit: f8d24cd1796bfe369fcd55feff191b99b96aa094
      https://github.com/D-Programming-Language/dmd/commit/f8d24cd1796bfe369fcd55feff191b99b96aa094
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-06 (Tue, 06 Oct 2015)

  Changed paths:
    M src/declaration.d
    M src/denum.d
    M src/doc.d
    M src/enum.h
    M src/iasm.c
    M src/json.d
    M src/mtype.d
    M src/tocvdebug.c
    M src/visitor.d
    M src/visitor.h
    M test/compilable/ddoc9.d
    M test/compilable/extra-files/ddoc9.html
    A test/compilable/imports/test15150a.d
    A test/compilable/imports/test15150b.d
    A test/compilable/test15150.d
    M test/fail_compilation/fail10528.d

  Log Message:
  -----------
  Merge pull request #5161 from 9rnsr/fix15150

[REG2.068.1] Issue 15150 - Public selective import causes conflict


  Commit: 8f0db5aa59f3f955dbed24fc3f8354d57553e149
      https://github.com/D-Programming-Language/dmd/commit/8f0db5aa59f3f955dbed24fc3f8354d57553e149
  Author: Martin Nowak <code at dawg.eu>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M src/declaration.d
    M src/denum.d
    M src/doc.d
    M src/dtemplate.d
    M src/enum.h
    M src/iasm.c
    M src/json.d
    M src/mtype.d
    M src/tocvdebug.c
    M src/visitor.d
    M src/visitor.h
    M test/compilable/ddoc9.d
    M test/compilable/extra-files/ddoc9.html
    A test/compilable/imports/test15150a.d
    A test/compilable/imports/test15150b.d
    A test/compilable/test15150.d
    M test/fail_compilation/fail10528.d
    A test/runnable/ice15138.d
    A test/runnable/imports/ice15138a.d
    M test/runnable/template9.d

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/stable' into merge_stable

# Conflicts:
#	test/runnable/template9.d


  Commit: 94d9694764c380fa70c3ff9cfa2c290f833c5d7f
      https://github.com/D-Programming-Language/dmd/commit/94d9694764c380fa70c3ff9cfa2c290f833c5d7f
  Author: Hara Kenji <k.hara.pg+dev at gmail.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M src/declaration.d
    M src/denum.d
    M src/doc.d
    M src/dtemplate.d
    M src/enum.h
    M src/iasm.c
    M src/json.d
    M src/mtype.d
    M src/tocvdebug.c
    M src/visitor.d
    M src/visitor.h
    M test/compilable/ddoc9.d
    M test/compilable/extra-files/ddoc9.html
    A test/compilable/imports/test15150a.d
    A test/compilable/imports/test15150b.d
    A test/compilable/test15150.d
    M test/fail_compilation/fail10528.d
    A test/runnable/ice15138.d
    A test/runnable/imports/ice15138a.d
    M test/runnable/template9.d

  Log Message:
  -----------
  Merge pull request #5167 from MartinNowak/merge_stable

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


Compare: https://github.com/D-Programming-Language/dmd/compare/5e73c30db693...94d9694764c3


More information about the dmd-internals mailing list