d: Import dmd b8384668f, druntime e6caaab9, phobos 5ab9ad256 (v2.098.0-beta.1)

The D front-end is now itself written in D, in order to build GDC, you
will need a working GDC compiler (GCC version 9.1 or later).

GCC changes:

    - Add support for bootstrapping the D front-end.

These add the required components in order to have a D front-end written
in D itself.  Because the compiler front-end only depends on the core
runtime modules, only libdruntime is built for the bootstrap stages.

D front-end changes:

    - Import dmd v2.098.0-beta.1.

Druntime changes:

    - Import druntime v2.098.0-beta.1.

Phobos changes:

    - Import phobos v2.098.0-beta.1.

The jump from v2.076.1 to v2.098.0 covers nearly 4 years worth of
development on the D programming language and run-time libraries.

ChangeLog:

	* Makefile.def: Add bootstrap to libbacktrace, libphobos, zlib, and
	libatomic.
	* Makefile.in: Regenerate.
	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Fix command for GDC.
	(STAGE1_CONFIGURE_FLAGS): Add --with-libphobos-druntime-only if
	target-libphobos-bootstrap.
	(STAGE2_CONFIGURE_FLAGS): Likewise.
	* configure: Regenerate.
	* configure.ac: Add support for bootstrapping D front-end.

config/ChangeLog:

	* acx.m4 (ACX_PROG_GDC): New m4 function.

gcc/ChangeLog:

	* Makefile.in (GDC): New variable.
	(GDCFLAGS): New variable.
	* configure: Regenerate.
	* configure.ac: Add call to ACX_PROG_GDC.  Substitute GDCFLAGS.

gcc/d/ChangeLog:

	* dmd/MERGE: Merge upstream dmd b8384668f.
	* Make-lang.in (d-warn): Use strict warnings.
	(DMD_WARN_CXXFLAGS): Remove.
	(DMD_COMPILE): Remove.
	(CHECKING_DFLAGS): Define.
	(WARN_DFLAGS): Define.
	(ALL_DFLAGS): Define.
	(DCOMPILE.base): Define.
	(DCOMPILE): Define.
	(DPOSTCOMPILE): Define.
	(DLINKER): Define.
	(DLLINKER): Define.
	(D_FRONTEND_OBJS): Add new dmd front-end objects.
	(D_GENERATED_SRCS): Remove.
	(D_GENERATED_OBJS): Remove.
	(D_ALL_OBJS): Remove D_GENERATED_OBJS.
	(d21$(exeext)): Build using DLLINKER and -static-libphobos.
	(d.tags): Remove dmd/*.c and dmd/root/*.c.
	(d.mostlyclean): Remove D_GENERATED_SRCS, d/idgen$(build_exeext),
	d/impcnvgen$(build_exeext).
	(D_INCLUDES): Include $(srcdir)/d/dmd/res.
	(CFLAGS-d/id.o): Remove.
	(CFLAGS-d/impcnvtab.o): Remove.
	(d/%.o): Build using DCOMPILE and DPOSTCOMPILE.  Update dependencies
	from d/dmd/%.c to d/dmd/%.d.
	(d/idgen$(build_exeext)): Remove.
	(d/impcnvgen$(build_exeext)): Remove.
	(d/id.c): Remove.
	(d/id.h): Remove.
	(d/impcnvtab.c): Remove.
	(d/%.dmdgen.o): Remove.
	(D_SYSTEM_H): Remove.
	(d/idgen.dmdgen.o): Remove.
	(d/impcnvgen.dmdgen.o): Remove.
	* config-lang.in (boot_language): New variable.
	* d-attribs.cc: Include dmd/expression.h.
	* d-builtins.cc: Include d-frontend.h.
	(build_frontend_type): Update for new front-end interface.
	(d_eval_constant_expression): Likewise.
	(d_build_builtins_module): Likewise.
	(maybe_set_builtin_1): Likewise.
	(d_build_d_type_nodes): Likewise.
	* d-codegen.cc (d_decl_context): Likewise.
	(declaration_reference_p): Likewise.
	(declaration_type): Likewise.
	(parameter_reference_p): Likewise.
	(parameter_type): Likewise.
	(get_array_length): Likewise.
	(build_delegate_cst): Likewise.
	(build_typeof_null_value): Likewise.
	(identity_compare_p): Likewise.
	(lower_struct_comparison): Likewise.
	(build_filename_from_loc): Likewise.
	(build_assert_call): Remove LIBCALL_SWITCH_ERROR.
	(build_bounds_index_condition): Call LIBCALL_ARRAYBOUNDS_INDEXP on
	bounds error.
	(build_bounds_slice_condition): Call LIBCALL_ARRAYBOUNDS_SLICEP on
	bounds error.
	(array_bounds_check): Update for new front-end interface.
	(checkaction_trap_p): Handle CHECKACTION_context.
	(get_function_type): Update for new front-end interface.
	(d_build_call): Likewise.
	* d-compiler.cc: Remove include of dmd/scope.h.
	(Compiler::genCmain): Remove.
	(Compiler::paintAsType): Update for new front-end interface.
	(Compiler::onParseModule): Likewise.
	* d-convert.cc (convert_expr): Remove call to LIBCALL_ARRAYCAST.
	(convert_for_rvalue): Update for new front-end interface.
	(convert_for_assignment): Likewise.
	(convert_for_condition): Likewise.
	(d_array_convert): Likewise.
	* d-diagnostic.cc (error): Remove.
	(errorSupplemental): Remove.
	(warning): Remove.
	(warningSupplemental): Remove.
	(deprecation): Remove.
	(deprecationSupplemental): Remove.
	(message): Remove.
	(vtip): New.
	* d-frontend.cc (global): Remove.
	(Global::_init): Remove.
	(Global::startGagging): Remove.
	(Global::endGagging): Remove.
	(Global::increaseErrorCount): Remove.
	(Loc::Loc): Remove.
	(Loc::toChars): Remove.
	(Loc::equals): Remove.
	(isBuiltin): Update for new front-end interface.
	(eval_builtin): Likewise.
	(getTypeInfoType): Likewise.
	(inlineCopy): Remove.
	* d-incpath.cc: Include d-frontend.h.
	(add_globalpaths): Call d_gc_malloc to allocate Strings.
	(add_filepaths): Likewise.
	* d-lang.cc: Include dmd/id.h, dmd/root/file.h, d-frontend.h.  Remove
	include of dmd/mars.h, id.h.
	(entrypoint_module): Remove.
	(entrypoint_root_module): Remove.
	(deps_write_string): Update for new front-end interface.
	(deps_write): Likewise.
	(d_init_options): Call rt_init.  Remove setting global params that are
	default initialized by the front-end.
	(d_handle_option): Handle OPT_fcheckaction_, OPT_fdump_c___spec_,
	OPT_fdump_c___spec_verbose, OPT_fextern_std_, OPT_fpreview,
	OPT_revert, OPT_fsave_mixins_, and OPT_ftransition.
	(d_post_options): Propagate dip1021 and dip1000 preview flags to
	dip25, and flag_diagnostics_show_caret to printErrorContext.
	(d_add_entrypoint_module): Remove.
	(d_parse_file): Update for new front-end interface.
	(d_type_promotes_to): Likewise.
	(d_types_compatible_p): Likewise.
	* d-longdouble.cc (CTFloat::zero): Remove.
	(CTFloat::one): Remove.
	(CTFloat::minusone): Remove.
	(CTFloat::half): Remove.
	* d-system.h (POSIX): Remove.
	(realpath): Remove.
	(isalpha): Remove.
	(isalnum): Remove.
	(isdigit): Remove.
	(islower): Remove.
	(isprint): Remove.
	(isspace): Remove.
	(isupper): Remove.
	(isxdigit): Remove.
	(tolower): Remove.
	(_mkdir): Remove.
	(INT32_MAX): Remove.
	(INT32_MIN): Remove.
	(INT64_MIN): Remove.
	(UINT32_MAX): Remove.
	(UINT64_MAX): Remove.
	* d-target.cc: Include calls.h.
	(target): Remove.
	(define_float_constants): Remove initialization of snan.
	(Target::_init): Update for new front-end interface.
	(Target::isVectorTypeSupported): Likewise.
	(Target::isVectorOpSupported): Remove cases for unordered operators.
	(TargetCPP::typeMangle): Update for new front-end interface.
	(TargetCPP::parameterType): Likewise.
	(Target::systemLinkage): Likewise.
	(Target::isReturnOnStack): Likewise.
	(Target::isCalleeDestroyingArgs): Define.
	(Target::preferPassByRef): Define.
	* d-tree.h (d_add_entrypoint_module): Remove.
	* decl.cc (gcc_attribute_p): Update for new front-end interface.
	(apply_pragma_crt): Define.
	(DeclVisitor::visit(PragmaDeclaration *)): Handle pragmas
	crt_constructor and crt_destructor.
	(DeclVisitor::visit(TemplateDeclaration *)): Update for new front-end
	interface.
	(DeclVisitor::visit): Likewise.
	(DeclVisitor::finish_vtable): Likewise.
	(get_symbol_decl): Error if template has more than one nesting
	context.  Update for new front-end interface.
	(make_thunk): Update for new front-end interface.
	(get_vtable_decl): Likewise.
	* expr.cc (ExprVisitor::visit): Likewise.
	(build_return_dtor): Likewise.
	* imports.cc (ImportVisitor::visit): Likewise.
	* intrinsics.cc: Include dmd/expression.h.  Remove include of
	dmd/mangle.h.
	(maybe_set_intrinsic): Update for new front-end interface.
	* intrinsics.def (INTRINSIC_ROL): Update intrinsic signature.
	(INTRINSIC_ROR): Likewise.
	(INTRINSIC_ROR_TIARG): Likewise.
	(INTRINSIC_TOPREC): Likewise.
	(INTRINSIC_TOPRECL): Likewise.
	(INTRINSIC_TAN): Update intrinsic module and signature.
	(INTRINSIC_ISNAN): Likewise.
	(INTRINSIC_ISFINITE): Likewise.
	(INTRINSIC_COPYSIGN): Define intrinsic.
	(INTRINSIC_COPYSIGNI): Define intrinsic.
	(INTRINSIC_EXP): Update intrinsic module.
	(INTRINSIC_EXPM1): Likewise.
	(INTRINSIC_EXP2): Likewise.
	(INTRINSIC_LOG): Likewise.
	(INTRINSIC_LOG2): Likewise.
	(INTRINSIC_LOG10): Likewise.
	(INTRINSIC_POW): Likewise.
	(INTRINSIC_ROUND): Likewise.
	(INTRINSIC_FLOORF): Likewise.
	(INTRINSIC_FLOOR): Likewise.
	(INTRINSIC_FLOORL): Likewise.
	(INTRINSIC_CEILF): Likewise.
	(INTRINSIC_CEIL): Likewise.
	(INTRINSIC_CEILL): Likewise.
	(INTRINSIC_TRUNC): Likewise.
	(INTRINSIC_FMIN): Likewise.
	(INTRINSIC_FMAX): Likewise.
	(INTRINSIC_FMA): Likewise.
	(INTRINSIC_VA_ARG): Update intrinsic signature.
	(INTRINSIC_VASTART): Likewise.
	* lang.opt (fcheck=): Add alternate aliases for contract switches.
	(fcheckaction=): New option.
	(check_action): New Enum and EnumValue entries.
	(fdump-c++-spec-verbose): New option.
	(fdump-c++-spec=): New option.
	(fextern-std=): New option.
	(extern_stdcpp): New Enum and EnumValue entries
	(fpreview=): New options.
	(frevert=): New options.
	(fsave-mixins): New option.
	(ftransition=): Update options.
	* modules.cc (get_internal_fn): Replace Prot with Visibility.
	(build_internal_fn): Likewise.
	(build_dso_cdtor_fn): Likewise.
	(build_module_tree): Remove check for __entrypoint module.
	* runtime.def (P5): Define.
	(ARRAYBOUNDS_SLICEP): Define.
	(ARRAYBOUNDS_INDEXP): Define.
	(NEWTHROW): Define.
	(ADCMP2): Remove.
	(ARRAYCAST): Remove.
	(SWITCH_STRING): Remove.
	(SWITCH_USTRING): Remove.
	(SWITCH_DSTRING): Remove.
	(SWITCH_ERROR): Remove.
	* toir.cc (IRVisitor::visit): Update for new front-end interface.
	(IRVisitor::check_previous_goto): Remove checks for case and default
	statements.
	(IRVisitor::visit(SwitchStatement *)): Remove handling of string
	switch conditions.
	* typeinfo.cc: Include d-frontend.h.
	(get_typeinfo_kind): Update for new front-end interface.
	(make_frontend_typeinfo): Likewise.
	(TypeInfoVisitor::visit): Likewise.
	(builtin_typeinfo_p): Likewise.
	(get_typeinfo_decl): Likewise.
	(build_typeinfo): Likewise.
	* types.cc (valist_array_p): Likewise.
	(make_array_type): Likewise.
	(merge_aggregate_types): Likewise.
	(TypeVisitor::visit(TypeBasic *)): Likewise.
	(TypeVisitor::visit(TypeFunction *)): Likewise.
	(TypeVisitor::visit(TypeStruct *)): Update comment.
	* verstr.h: Removed.
	* d-frontend.h: New file.

gcc/po/ChangeLog:

	* EXCLUDES: Remove d/dmd sources from list.

gcc/testsuite/ChangeLog:

	* gdc.dg/Wcastresult2.d: Update test.
	* gdc.dg/asm1.d: Likewise.
	* gdc.dg/asm2.d: Likewise.
	* gdc.dg/asm3.d: Likewise.
	* gdc.dg/gdc282.d: Likewise.
	* gdc.dg/imports/gdc170.d: Likewise.
	* gdc.dg/intrinsics.d: Likewise.
	* gdc.dg/pr101672.d: Likewise.
	* gdc.dg/pr90650a.d: Likewise.
	* gdc.dg/pr90650b.d: Likewise.
	* gdc.dg/pr94777a.d: Likewise.
	* gdc.dg/pr95250.d: Likewise.
	* gdc.dg/pr96869.d: Likewise.
	* gdc.dg/pr98277.d: Likewise.
	* gdc.dg/pr98457.d: Likewise.
	* gdc.dg/simd1.d: Likewise.
	* gdc.dg/simd2a.d: Likewise.
	* gdc.dg/simd2b.d: Likewise.
	* gdc.dg/simd2c.d: Likewise.
	* gdc.dg/simd2d.d: Likewise.
	* gdc.dg/simd2e.d: Likewise.
	* gdc.dg/simd2f.d: Likewise.
	* gdc.dg/simd2g.d: Likewise.
	* gdc.dg/simd2h.d: Likewise.
	* gdc.dg/simd2i.d: Likewise.
	* gdc.dg/simd2j.d: Likewise.
	* gdc.dg/simd7951.d: Likewise.
	* gdc.dg/torture/gdc309.d: Likewise.
	* gdc.dg/torture/pr94424.d: Likewise.
	* gdc.dg/torture/pr94777b.d: Likewise.
	* lib/gdc-utils.exp (gdc-convert-args): Handle new compiler options.
	(gdc-convert-test): Handle CXXFLAGS, EXTRA_OBJC_SOURCES, and ARG_SETS
	test directives.
	(gdc-do-test): Only import modules in the test run directory.
	* gdc.dg/pr94777c.d: New test.
	* gdc.dg/pr96156b.d: New test.
	* gdc.dg/pr96157c.d: New test.
	* gdc.dg/simd_ctfe.d: New test.
	* gdc.dg/torture/simd17344.d: New test.
	* gdc.dg/torture/simd20052.d: New test.
	* gdc.dg/torture/simd6.d: New test.
	* gdc.dg/torture/simd7.d: New test.

libphobos/ChangeLog:

	* libdruntime/MERGE: Merge upstream druntime e6caaab9.
	* libdruntime/Makefile.am (D_EXTRA_FLAGS): Build libdruntime with
	-fpreview=dip1000, -fpreview=fieldwise, and -fpreview=dtorfields.
	(ALL_DRUNTIME_SOURCES): Add DRUNTIME_DSOURCES_STDCXX.
	(DRUNTIME_DSOURCES): Update list of C binding modules.
	(DRUNTIME_DSOURCES_STDCXX): Likewise.
	(DRUNTIME_DSOURCES_LINUX): Likewise.
	(DRUNTIME_DSOURCES_OPENBSD): Likewise.
	(DRUNTIME_DISOURCES): Remove __entrypoint.di.
	* libdruntime/Makefile.in: Regenerated.
	* libdruntime/__entrypoint.di: Removed.
	* libdruntime/gcc/deh.d (_d_isbaseof): Update signature.
	(_d_createTrace): Likewise.
	(__gdc_begin_catch): Remove reference to the exception.
	(_d_throw): Increment reference count of thrown object before unwind.
	(__gdc_personality): Chain exceptions with  Throwable.chainTogether.
	* libdruntime/gcc/emutls.d: Update imports.
	* libdruntime/gcc/sections/elf.d: Update imports.
	(DSO.moduleGroup): Update signature.
	* libdruntime/gcc/sections/macho.d: Update imports.
	(DSO.moduleGroup): Update signature.
	* libdruntime/gcc/sections/pecoff.d: Update imports.
	(DSO.moduleGroup): Update signature.
	* src/MERGE: Merge upstream phobos 5ab9ad256.
	* src/Makefile.am (D_EXTRA_DFLAGS): Add -fpreview=dip1000 and
	-fpreview=dtorfields flags.
	(PHOBOS_DSOURCES): Update list of std modules.
	* src/Makefile.in: Regenerate.
	* testsuite/lib/libphobos.exp (libphobos-dg-test): Handle assembly
	compile types.
	(dg-test): Override.
	(additional_prunes): Define.
	(libphobos-dg-prune): Filter any additional_prunes set by tests.
	* testsuite/libphobos.aa/test_aa.d: Update test.
	* testsuite/libphobos.druntime/druntime.exp (version_flags): Add
	-fversion=CoreUnittest.
	* testsuite/libphobos.druntime_shared/druntime_shared.exp
	(version_flags): Add -fversion=CoreUnittest -fversion=Shared.
	* testsuite/libphobos.exceptions/unknown_gc.d: Update test.
	* testsuite/libphobos.hash/test_hash.d: Update test.
	* testsuite/libphobos.phobos/phobos.exp (version_flags): Add
	-fversion=StdUnittest
	* testsuite/libphobos.phobos_shared/phobos_shared.exp (version_flags):
	Likewise.
	* testsuite/libphobos.shared/host.c: Update test.
	* testsuite/libphobos.shared/load.d: Update test.
	* testsuite/libphobos.shared/load_13414.d: Update test.
	* testsuite/libphobos.thread/fiber_guard_page.d: Update test.
	* testsuite/libphobos.thread/tlsgc_sections.d: Update test.
	* testsuite/testsuite_flags.in: Add -fpreview=dip1000 to --gdcflags.
	* testsuite/libphobos.shared/link_mod_collision.d: Removed.
	* testsuite/libphobos.shared/load_mod_collision.d: Removed.
	* testsuite/libphobos.betterc/betterc.exp: New test.
	* testsuite/libphobos.config/config.exp: New test.
	* testsuite/libphobos.gc/gc.exp: New test.
	* testsuite/libphobos.imports/imports.exp: New test.
	* testsuite/libphobos.lifetime/lifetime.exp: New test.
	* testsuite/libphobos.unittest/unittest.exp: New test.

1 files changed, 0 insertions, 888 deletions

diff --git a/gcc/d/dmd/json.c b/gcc/d/dmd/json.c
deleted file mode 100644
index 832e559..0000000
--- a/gcc/d/dmd/json.c
+++ /dev/null
@@ -1,888 +0,0 @@
-
-/* Compiler implementation of the D programming language
- * Copyright (C) 1999-2021 by The D Language Foundation, All Rights Reserved
- * written by Walter Bright
- * http://www.digitalmars.com
- * Distributed under the Boost Software License, Version 1.0.
- * http://www.boost.org/LICENSE_1_0.txt
- * https://github.com/D-Programming-Language/dmd/blob/master/src/json.c
- */
-
-// This implements the JSON capability.
-
-#include "root/dsystem.h"
-#include "root/rmem.h"
-
-#include "mars.h"
-#include "dsymbol.h"
-#include "template.h"
-#include "aggregate.h"
-#include "declaration.h"
-#include "enum.h"
-#include "module.h"
-#include "json.h"
-#include "mtype.h"
-#include "attrib.h"
-#include "cond.h"
-#include "init.h"
-#include "import.h"
-#include "id.h"
-#include "hdrgen.h"
-
-class ToJsonVisitor : public Visitor
-{
-public:
-    OutBuffer *buf;
-    int indentLevel;
-    const char *filename;
-
-    ToJsonVisitor(OutBuffer *buf)
-        : buf(buf), indentLevel(0), filename(NULL)
-    {
-    }
-
-    void indent()
-    {
-        if (buf->length() >= 1 &&
-            buf->slice().ptr[buf->length() - 1] == '\n')
-            for (int i = 0; i < indentLevel; i++)
-                buf->writeByte(' ');
-    }
-
-    void removeComma()
-    {
-        if (buf->length() >= 2 &&
-            buf->slice().ptr[buf->length() - 2] == ',' &&
-            (buf->slice().ptr[buf->length() - 1] == '\n' || buf->slice().ptr[buf->length() - 1] == ' '))
-            buf->setsize(buf->length() - 2);
-    }
-
-    void comma()
-    {
-        if (indentLevel > 0)
-            buf->writestring(",\n");
-    }
-
-    void stringStart()
-    {
-        buf->writeByte('\"');
-    }
-
-    void stringEnd()
-    {
-        buf->writeByte('\"');
-    }
-
-    void stringPart(const char *s)
-    {
-        for (; *s; s++)
-        {
-            utf8_t c = (utf8_t) *s;
-            switch (c)
-            {
-                case '\n':
-                    buf->writestring("\\n");
-                    break;
-
-                case '\r':
-                    buf->writestring("\\r");
-                    break;
-
-                case '\t':
-                    buf->writestring("\\t");
-                    break;
-
-                case '\"':
-                    buf->writestring("\\\"");
-                    break;
-
-                case '\\':
-                    buf->writestring("\\\\");
-                    break;
-
-                case '\b':
-                    buf->writestring("\\b");
-                    break;
-
-                case '\f':
-                    buf->writestring("\\f");
-                    break;
-
-                default:
-                    if (c < 0x20)
-                        buf->printf("\\u%04x", c);
-                    else
-                    {
-                        // Note that UTF-8 chars pass through here just fine
-                        buf->writeByte(c);
-                    }
-                    break;
-            }
-        }
-    }
-
-    // Json value functions
-
-    /*********************************
-     * Encode string into buf, and wrap it in double quotes.
-     */
-    void value(const char *s)
-    {
-        stringStart();
-        stringPart(s);
-        stringEnd();
-    }
-
-    void value(int value)
-    {
-        buf->printf("%d", value);
-    }
-
-    void valueBool(bool value)
-    {
-        buf->writestring(value ? "true" : "false");
-    }
-
-    /*********************************
-     * Item is an intented value and a comma, for use in arrays
-     */
-    void item(const char *s)
-    {
-        indent();
-        value(s);
-        comma();
-    }
-
-    void item(int i)
-    {
-        indent();
-        value(i);
-        comma();
-    }
-
-    void itemBool(bool b)
-    {
-        indent();
-        valueBool(b);
-        comma();
-    }
-
-
-    // Json array functions
-
-    void arrayStart()
-    {
-        indent();
-        buf->writestring("[\n");
-        indentLevel++;
-    }
-
-    void arrayEnd()
-    {
-        indentLevel--;
-        removeComma();
-        if (buf->length() >= 2 &&
-            buf->slice().ptr[buf->length() - 2] == '[' &&
-            buf->slice().ptr[buf->length() - 1] == '\n')
-            buf->setsize(buf->length() - 1);
-        else if (!(buf->length() >= 1 &&
-            buf->slice().ptr[buf->length() - 1] == '['))
-        {
-            buf->writestring("\n");
-            indent();
-        }
-        buf->writestring("]");
-        comma();
-    }
-
-
-    // Json object functions
-
-    void objectStart()
-    {
-        indent();
-        buf->writestring("{\n");
-        indentLevel++;
-    }
-
-    void objectEnd()
-    {
-        indentLevel--;
-        removeComma();
-        if (buf->length() >= 2 &&
-            buf->slice().ptr[buf->length() - 2] == '{' &&
-            buf->slice().ptr[buf->length() - 1] == '\n')
-            buf->setsize(buf->length() - 1);
-        else
-        {
-            buf->writestring("\n");
-            indent();
-        }
-        buf->writestring("}");
-        comma();
-    }
-
-    // Json object property functions
-
-    void propertyStart(const char *name)
-    {
-        indent();
-        value(name);
-        buf->writestring(" : ");
-    }
-
-    void property(const char *name, const char *s)
-    {
-        if (s == NULL) return;
-
-        propertyStart(name);
-        value(s);
-        comma();
-    }
-
-    void property(const char *name, int i)
-    {
-        propertyStart(name);
-        value(i);
-        comma();
-    }
-
-    void propertyBool(const char *name, bool b)
-    {
-        propertyStart(name);
-        valueBool(b);
-        comma();
-    }
-
-
-    void property(const char *name, TRUST trust)
-    {
-        switch (trust)
-        {
-            case TRUSTdefault:
-                // Should not be printed
-                //property(name, "default");
-                break;
-            case TRUSTsystem:
-                property(name, "system");
-                break;
-            case TRUSTtrusted:
-                property(name, "trusted");
-                break;
-            case TRUSTsafe:
-                property(name, "safe");
-                break;
-            default:
-                assert(false);
-        }
-    }
-
-    void property(const char *name, PURE purity)
-    {
-        switch (purity)
-        {
-            case PUREimpure:
-                // Should not be printed
-                //property(name, "impure");
-                break;
-            case PUREweak:
-                property(name, "weak");
-                break;
-            case PUREconst:
-                property(name, "const");
-                break;
-            case PUREstrong:
-                property(name, "strong");
-                break;
-            case PUREfwdref:
-                property(name, "fwdref");
-                break;
-            default:
-                assert(false);
-        }
-    }
-
-    void property(const char *name, LINK linkage)
-    {
-        switch (linkage)
-        {
-            case LINKdefault:
-                // Should not be printed
-                //property(name, "default");
-                break;
-            case LINKd:
-                // Should not be printed
-                //property(name, "d");
-                break;
-            case LINKc:
-                property(name, "c");
-                break;
-            case LINKcpp:
-                property(name, "cpp");
-                break;
-            case LINKwindows:
-                property(name, "windows");
-                break;
-            default:
-                assert(false);
-        }
-    }
-
-    void propertyStorageClass(const char *name, StorageClass stc)
-    {
-        stc &= STCStorageClass;
-        if (stc)
-        {
-            propertyStart(name);
-            arrayStart();
-
-            while (stc)
-            {
-                const char *p = stcToChars(stc);
-                assert(p);
-                item(p);
-            }
-
-            arrayEnd();
-        }
-    }
-
-    void property(const char *linename, const char *charname, Loc *loc)
-    {
-        if (loc)
-        {
-            const char *filename = loc->filename;
-            if (filename)
-            {
-                if (!this->filename || strcmp(filename, this->filename))
-                {
-                    this->filename = filename;
-                    property("file", filename);
-                }
-            }
-
-            if (loc->linnum)
-            {
-                property(linename, loc->linnum);
-                if (loc->charnum)
-                    property(charname, loc->charnum);
-            }
-        }
-    }
-
-    void property(const char *name, Type *type)
-    {
-        if (type)
-        {
-            property(name, type->toChars());
-        }
-    }
-
-    void property(const char *name, const char *deconame, Type *type)
-    {
-        if (type)
-        {
-            if (type->deco)
-                property(deconame, type->deco);
-            else
-                property(name, type->toChars());
-        }
-    }
-
-    void property(const char *name, Parameters *parameters)
-    {
-        if (parameters == NULL || parameters->length == 0)
-            return;
-
-        propertyStart(name);
-        arrayStart();
-
-        if (parameters)
-        {
-            for (size_t i = 0; i < parameters->length; i++)
-            {
-                Parameter *p = (*parameters)[i];
-                objectStart();
-
-                if (p->ident)
-                    property("name", p->ident->toChars());
-
-                property("type", "deco", p->type);
-
-                propertyStorageClass("storageClass", p->storageClass);
-
-                if (p->defaultArg)
-                    property("default", p->defaultArg->toChars());
-
-
-                objectEnd();
-            }
-        }
-
-        arrayEnd();
-    }
-
-    /* ========================================================================== */
-
-    void jsonProperties(Dsymbol *s)
-    {
-        if (s->isModule())
-            return;
-
-        if (!s->isTemplateDeclaration()) // TemplateDeclaration::kind() acts weird sometimes
-        {
-            property("name", s->toChars());
-            property("kind", s->kind());
-        }
-
-        if (s->prot().kind != Prot::public_)   // TODO: How about package(names)?
-            property("protection", protectionToChars(s->prot().kind));
-
-        if (EnumMember *em = s->isEnumMember())
-        {
-            if (em->origValue)
-                property("value", em->origValue->toChars());
-        }
-
-        property("comment", (const char *)s->comment);
-
-        property("line", "char", &s->loc);
-    }
-
-    void jsonProperties(Declaration *d)
-    {
-        if (d->storage_class & STClocal)
-            return;
-        jsonProperties((Dsymbol *)d);
-
-        propertyStorageClass("storageClass", d->storage_class);
-
-        property("type", "deco", d->type);
-
-        // Emit originalType if it differs from type
-        if (d->type != d->originalType && d->originalType)
-        {
-            const char *ostr = d->originalType->toChars();
-            if (d->type)
-            {
-                const char *tstr = d->type->toChars();
-                if (strcmp(tstr, ostr))
-                {
-                    //printf("tstr = %s, ostr = %s\n", tstr, ostr);
-                    property("originalType", ostr);
-                }
-            }
-            else
-                property("originalType", ostr);
-        }
-    }
-
-    void jsonProperties(TemplateDeclaration *td)
-    {
-        jsonProperties((Dsymbol *)td);
-
-        if (td->onemember && td->onemember->isCtorDeclaration())
-            property("name", "this");  // __ctor -> this
-        else
-            property("name", td->ident->toChars());  // Foo(T) -> Foo
-    }
-
-    /* ========================================================================== */
-
-    void visit(Dsymbol *)
-    {
-    }
-
-    void visit(Module *s)
-    {
-        objectStart();
-
-        if (s->md)
-            property("name", s->md->toChars());
-
-        property("kind", s->kind());
-
-        filename = s->srcfile->toChars();
-        property("file", filename);
-
-        property("comment", (const char *)s->comment);
-
-        propertyStart("members");
-        arrayStart();
-        for (size_t i = 0; i < s->members->length; i++)
-        {
-            (*s->members)[i]->accept(this);
-        }
-        arrayEnd();
-
-        objectEnd();
-    }
-
-    void visit(Import *s)
-    {
-        if (s->id == Id::object)
-            return;
-
-        objectStart();
-
-        propertyStart("name");
-        stringStart();
-        if (s->packages && s->packages->length)
-        {
-            for (size_t i = 0; i < s->packages->length; i++)
-            {
-                Identifier *pid = (*s->packages)[i];
-                stringPart(pid->toChars());
-                buf->writeByte('.');
-            }
-        }
-        stringPart(s->id->toChars());
-        stringEnd();
-        comma();
-
-        property("kind", s->kind());
-        property("comment", (const char *)s->comment);
-        property("line", "char", &s->loc);
-        if (s->prot().kind != Prot::public_)
-            property("protection", protectionToChars(s->prot().kind));
-        if (s->aliasId)
-            property("alias", s->aliasId->toChars());
-
-        bool hasRenamed = false;
-        bool hasSelective = false;
-        for (size_t i = 0; i < s->aliases.length; i++)
-        {
-            // avoid empty "renamed" and "selective" sections
-            if (hasRenamed && hasSelective)
-                break;
-            else if (s->aliases[i])
-                hasRenamed = true;
-            else
-                hasSelective = true;
-        }
-
-        if (hasRenamed)
-        {
-            // import foo : alias1 = target1;
-            propertyStart("renamed");
-            objectStart();
-            for (size_t i = 0; i < s->aliases.length; i++)
-            {
-                Identifier *name = s->names[i];
-                Identifier *alias = s->aliases[i];
-                if (alias) property(alias->toChars(), name->toChars());
-            }
-            objectEnd();
-        }
-
-        if (hasSelective)
-        {
-            // import foo : target1;
-            propertyStart("selective");
-            arrayStart();
-            for (size_t i = 0; i < s->names.length; i++)
-            {
-                Identifier *name = s->names[i];
-                if (!s->aliases[i]) item(name->toChars());
-            }
-            arrayEnd();
-        }
-
-        objectEnd();
-    }
-
-    void visit(AttribDeclaration *d)
-    {
-        Dsymbols *ds = d->include(NULL);
-
-        if (ds)
-        {
-            for (size_t i = 0; i < ds->length; i++)
-            {
-                Dsymbol *s = (*ds)[i];
-                s->accept(this);
-            }
-        }
-    }
-
-    void visit(ConditionalDeclaration *d)
-    {
-        if (d->condition->inc)
-        {
-            visit((AttribDeclaration *)d);
-        }
-    }
-
-    void visit(TypeInfoDeclaration *) {}
-    void visit(PostBlitDeclaration *) {}
-
-    void visit(Declaration *d)
-    {
-        objectStart();
-
-        //property("unknown", "declaration");
-
-        jsonProperties(d);
-
-        objectEnd();
-    }
-
-    void visit(AggregateDeclaration *d)
-    {
-        objectStart();
-
-        jsonProperties(d);
-
-        ClassDeclaration *cd = d->isClassDeclaration();
-        if (cd)
-        {
-            if (cd->baseClass && cd->baseClass->ident != Id::Object)
-            {
-                property("base", cd->baseClass->toPrettyChars(true));
-            }
-            if (cd->interfaces.length)
-            {
-                propertyStart("interfaces");
-                arrayStart();
-                for (size_t i = 0; i < cd->interfaces.length; i++)
-                {
-                    BaseClass *b = cd->interfaces.ptr[i];
-                    item(b->sym->toPrettyChars(true));
-                }
-                arrayEnd();
-            }
-        }
-
-        if (d->members)
-        {
-            propertyStart("members");
-            arrayStart();
-            for (size_t i = 0; i < d->members->length; i++)
-            {
-                Dsymbol *s = (*d->members)[i];
-                s->accept(this);
-            }
-            arrayEnd();
-        }
-
-        objectEnd();
-    }
-
-    void visit(FuncDeclaration *d)
-    {
-        objectStart();
-
-        jsonProperties(d);
-
-        TypeFunction *tf = (TypeFunction *)d->type;
-        if (tf && tf->ty == Tfunction)
-            property("parameters", tf->parameterList.parameters);
-
-        property("endline", "endchar", &d->endloc);
-
-        if (d->foverrides.length)
-        {
-            propertyStart("overrides");
-            arrayStart();
-            for (size_t i = 0; i < d->foverrides.length; i++)
-            {
-                FuncDeclaration *fd = d->foverrides[i];
-                item(fd->toPrettyChars());
-            }
-            arrayEnd();
-        }
-
-        if (d->fdrequire)
-        {
-            propertyStart("in");
-            d->fdrequire->accept(this);
-        }
-
-        if (d->fdensure)
-        {
-            propertyStart("out");
-            d->fdensure->accept(this);
-        }
-
-        objectEnd();
-    }
-
-    void visit(TemplateDeclaration *d)
-    {
-        objectStart();
-
-        // TemplateDeclaration::kind returns the kind of its Aggregate onemember, if it is one
-        property("kind", "template");
-
-        jsonProperties(d);
-
-        propertyStart("parameters");
-        arrayStart();
-        for (size_t i = 0; i < d->parameters->length; i++)
-        {
-            TemplateParameter *s = (*d->parameters)[i];
-            objectStart();
-
-            property("name", s->ident->toChars());
-
-            TemplateTypeParameter *type = s->isTemplateTypeParameter();
-            if (type)
-            {
-                if (s->isTemplateThisParameter())
-                    property("kind", "this");
-                else
-                    property("kind", "type");
-                property("type", "deco", type->specType);
-
-                property("default", "defaultDeco", type->defaultType);
-            }
-
-            TemplateValueParameter *value = s->isTemplateValueParameter();
-            if (value)
-            {
-                property("kind", "value");
-
-                property("type", "deco", value->valType);
-
-                if (value->specValue)
-                    property("specValue", value->specValue->toChars());
-
-                if (value->defaultValue)
-                    property("defaultValue", value->defaultValue->toChars());
-            }
-
-            TemplateAliasParameter *alias = s->isTemplateAliasParameter();
-            if (alias)
-            {
-                property("kind", "alias");
-
-                property("type", "deco", alias->specType);
-
-                if (alias->specAlias)
-                    property("specAlias", alias->specAlias->toChars());
-
-                if (alias->defaultAlias)
-                    property("defaultAlias", alias->defaultAlias->toChars());
-            }
-
-            TemplateTupleParameter *tuple = s->isTemplateTupleParameter();
-            if (tuple)
-            {
-                property("kind", "tuple");
-            }
-
-            objectEnd();
-        }
-        arrayEnd();
-
-        Expression *expression = d->constraint;
-        if (expression)
-        {
-            property("constraint", expression->toChars());
-        }
-
-        propertyStart("members");
-        arrayStart();
-        for (size_t i = 0; i < d->members->length; i++)
-        {
-            Dsymbol *s = (*d->members)[i];
-            s->accept(this);
-        }
-        arrayEnd();
-
-        objectEnd();
-    }
-
-    void visit(EnumDeclaration *d)
-    {
-        if (d->isAnonymous())
-        {
-            if (d->members)
-            {
-                for (size_t i = 0; i < d->members->length; i++)
-                {
-                    Dsymbol *s = (*d->members)[i];
-                    s->accept(this);
-                }
-            }
-            return;
-        }
-
-        objectStart();
-
-        jsonProperties(d);
-
-        property("base", "baseDeco", d->memtype);
-
-        if (d->members)
-        {
-            propertyStart("members");
-            arrayStart();
-            for (size_t i = 0; i < d->members->length; i++)
-            {
-                Dsymbol *s = (*d->members)[i];
-                s->accept(this);
-            }
-            arrayEnd();
-        }
-
-        objectEnd();
-    }
-
-    void visit(EnumMember *s)
-    {
-        objectStart();
-
-        jsonProperties((Dsymbol*)s);
-
-        property("type", "deco", s->origType);
-
-        objectEnd();
-    }
-
-    void visit(VarDeclaration *d)
-    {
-        if (d->storage_class & STClocal)
-            return;
-        objectStart();
-
-        jsonProperties(d);
-
-        if (d->_init)
-            property("init", d->_init->toChars());
-
-        if (d->isField())
-            property("offset", d->offset);
-
-        if (d->alignment && d->alignment != STRUCTALIGN_DEFAULT)
-            property("align", d->alignment);
-
-        objectEnd();
-    }
-
-    void visit(TemplateMixin *d)
-    {
-        objectStart();
-
-        jsonProperties(d);
-
-        objectEnd();
-    }
-};
-
-
-void json_generate(OutBuffer *buf, Modules *modules)
-{
-    ToJsonVisitor json(buf);
-
-    json.arrayStart();
-    for (size_t i = 0; i < modules->length; i++)
-    {
-        Module *m = (*modules)[i];
-        if (global.params.verbose)
-            message("json gen %s", m->toChars());
-        m->accept(&json);
-    }
-    json.arrayEnd();
-    json.removeComma();
-}