Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ set(LDC_VERSION "1.13.0") # May be overridden by git hash tag
set(DMDFE_MAJOR_VERSION 2)
set(DMDFE_MINOR_VERSION 0)
set(DMDFE_PATCH_VERSION 83)
set(DMDFE_FIX_LEVEL 0) # Comment out if not used
set(DMDFE_FIX_LEVEL 1) # Comment out if not used

set(DMD_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}${DMDFE_PATCH_VERSION})
if(DEFINED DMDFE_FIX_LEVEL)
Expand Down
3 changes: 2 additions & 1 deletion dmd/func.d
Original file line number Diff line number Diff line change
Expand Up @@ -2906,7 +2906,8 @@ FuncDeclaration resolveFuncCall(const ref Loc loc, Scope* sc, Dsymbol s,
{
assert(fd);

if (fd.checkDisabled(loc, sc))
// remove when deprecation period of class allocators and deallocators is over
if (fd.isNewDeclaration() && fd.checkDisabled(loc, sc))
return null;

bool hasOverloads = fd.overnext !is null;
Expand Down
16 changes: 8 additions & 8 deletions gen/statements.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,19 +250,19 @@ class ToIRVisitor : public Visitor {
// emit dwarf stop point
irs->DBuilder.EmitStopPoint(stmt->loc);

emitCoverageLinecountInc(stmt->loc);
if (auto e = stmt->exp) {
if (e->hasCode())
emitCoverageLinecountInc(stmt->loc);

if (stmt->exp) {
elem *e;
DValue *elem;
// a cast(void) around the expression is allowed, but doesn't require any
// code
if (stmt->exp->op == TOKcast && stmt->exp->type == Type::tvoid) {
CastExp *cexp = static_cast<CastExp *>(stmt->exp);
e = toElemDtor(cexp->e1);
if (e->op == TOKcast && e->type == Type::tvoid) {
elem = toElemDtor(static_cast<CastExp *>(e)->e1);
} else {
e = toElemDtor(stmt->exp);
elem = toElemDtor(e);
}
delete e;
delete elem;
}
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/phobos
Submodule phobos updated 1 files
+9 −1 std/traits.d