mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-08 20:06:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of obsolete gen/llvmcompat.h

Browse source 
Not needed anymore since C++11.
This commit is contained in:
Martin 2018-01-12 20:20:43 +01:00
parent 9222e59b82
commit 27deb2ff8c
11 changed files with 55 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ddmd/root/array.h
View file

@ -244,7 +244,6 @@ struct Array
return *this;
}
#if LLVM_HAS_RVALUE_REFERENCES
Array(Array<TYPE> &&a)
{
if (data != &smallarray[0])
@ -285,7 +284,6 @@ struct Array
a.allocdim = 0;
return *this;
}
#endif // LLVM_HAS_RVALUE_REFERENCES
size_type size()
{

5
driver/toobj.cpp
View file

@ -148,7 +148,7 @@ class AssemblyAnnotator : public AssemblyAnnotationWriter {
public:
void emitFunctionAnnot(const Function *F,
formatted_raw_ostream &os) LLVM_OVERRIDE {
formatted_raw_ostream &os) override {
os << "; [#uses = " << F->getNumUses() << ']';
// show demangled name
@ -159,8 +159,7 @@ public:
os << '\n';
}
void printInfoComment(const Value &val,
formatted_raw_ostream &os) LLVM_OVERRIDE {
void printInfoComment(const Value &val, formatted_raw_ostream &os) override {
bool padding = false;
if (!val.getType()->isVoidTy()) {
os.PadToColumn(50);

1
gen/cl_helpers.h
View file

@ -17,7 +17,6 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Compiler.h"
#include "gen/llvmcompat.h"
#if LDC_LLVM_VER >= 500
#define LLVM_END_WITH_NULL

30
gen/declarations.cpp
View file

@ -43,14 +43,14 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(Dsymbol *sym) LLVM_OVERRIDE {
void visit(Dsymbol *sym) override {
IF_LOG Logger::println("Ignoring Dsymbol::codegen for %s",
sym->toPrettyChars());
}
//////////////////////////////////////////////////////////////////////////
void visit(Nspace *ns) LLVM_OVERRIDE {
void visit(Nspace *ns) override {
IF_LOG Logger::println("Nspace::codegen for %s", ns->toPrettyChars());
LOG_SCOPE
@ -62,7 +62,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(InterfaceDeclaration *decl) LLVM_OVERRIDE {
void visit(InterfaceDeclaration *decl) override {
IF_LOG Logger::println("InterfaceDeclaration::codegen: '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -104,7 +104,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(StructDeclaration *decl) LLVM_OVERRIDE {
void visit(StructDeclaration *decl) override {
IF_LOG Logger::println("StructDeclaration::codegen: '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -158,7 +158,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ClassDeclaration *decl) LLVM_OVERRIDE {
void visit(ClassDeclaration *decl) override {
IF_LOG Logger::println("ClassDeclaration::codegen: '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -205,7 +205,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TupleDeclaration *decl) LLVM_OVERRIDE {
void visit(TupleDeclaration *decl) override {
IF_LOG Logger::println("TupleDeclaration::codegen(): '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -227,7 +227,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(VarDeclaration *decl) LLVM_OVERRIDE {
void visit(VarDeclaration *decl) override {
IF_LOG Logger::println("VarDeclaration::codegen(): '%s'",
decl->toPrettyChars());
LOG_SCOPE;
@ -311,7 +311,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(EnumDeclaration *decl) LLVM_OVERRIDE {
void visit(EnumDeclaration *decl) override {
IF_LOG Logger::println("Ignoring EnumDeclaration::codegen: '%s'",
decl->toPrettyChars());
@ -323,7 +323,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(FuncDeclaration *decl) LLVM_OVERRIDE {
void visit(FuncDeclaration *decl) override {
// don't touch function aliases, they don't contribute any new symbols
if (!decl->isFuncAliasDeclaration()) {
DtoDefineFunction(decl);
@ -332,7 +332,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TemplateInstance *decl) LLVM_OVERRIDE {
void visit(TemplateInstance *decl) override {
IF_LOG Logger::println("TemplateInstance::codegen: '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -375,7 +375,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TemplateMixin *decl) LLVM_OVERRIDE {
void visit(TemplateMixin *decl) override {
IF_LOG Logger::println("TemplateInstance::codegen: '%s'",
decl->toPrettyChars());
LOG_SCOPE
@ -394,7 +394,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(AttribDeclaration *decl) LLVM_OVERRIDE {
void visit(AttribDeclaration *decl) override {
Dsymbols *d = decl->include(nullptr, nullptr);
if (d) {
@ -406,7 +406,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(PragmaDeclaration *decl) LLVM_OVERRIDE {
void visit(PragmaDeclaration *decl) override {
if (decl->ident == Id::lib) {
assert(decl->args && decl->args->dim == 1);
assert(!irs->dcomputetarget);
@ -470,14 +470,14 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TypeInfoDeclaration *decl) LLVM_OVERRIDE {
void visit(TypeInfoDeclaration *decl) override {
if (!irs->dcomputetarget)
TypeInfoDeclaration_codegen(decl, irs);
}
//////////////////////////////////////////////////////////////////////////
void visit(TypeInfoClassDeclaration *decl) LLVM_OVERRIDE {
void visit(TypeInfoClassDeclaration *decl) override {
if (!irs->dcomputetarget)
TypeInfoClassDeclaration_codegen(decl, irs);
}

2
gen/functions.cpp
View file

@ -185,7 +185,7 @@ llvm::FunctionType *DtoFunctionType(Type *type, IrFuncTy &irFty, Type *thistype,
abi->rewriteFunctionType(f, newIrFty);
// Now we can modify irFty safely.
irFty = llvm_move(newIrFty);
irFty = std::move(newIrFty);
// Finally build the actual LLVM function type.
llvm::SmallVector<llvm::Type *, 16> argtypes;

3
gen/llvm.h
View file

@ -31,9 +31,6 @@
#include "llvm/IR/DataLayout.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/DebugInfo.h"
#include "gen/llvmcompat.h"
#include "llvm/IR/CallSite.h"
using llvm::IRBuilder;

53
gen/llvmcompat.h
View file

@ -1,53 +0,0 @@
//===-- gen/llvmcompat.h - LLVM API compatibilty shims ----------*- C++ -*-===//
//
// LDC – the LLVM D compiler
//
// This file is distributed under the BSD-style LDC license. See the LICENSE
// file for details.
//
//===----------------------------------------------------------------------===//
//
// Provides a central place to handle API changes between supported LLVM
// versions.
//
//===----------------------------------------------------------------------===//
#ifdef _MSC_VER
#pragma once
#endif
#ifndef LDC_LLVMCOMPAT_H
#define LDC_LLVMCOMPAT_H
#if !defined(LDC_LLVM_VER)
#error "Please specify value for LDC_LLVM_VER."
#endif
#define ADDRESS_SPACE 0
#ifndef __has_feature
#define __has_feature(x) 0
#endif
#if __has_feature(cxx_override_control) || \
(defined(_MSC_VER) && _MSC_VER >= 1700)
#define LLVM_OVERRIDE override
#else
#define LLVM_OVERRIDE
#endif
#if (__has_feature(cxx_rvalue_references) || \
defined(__GXX_EXPERIMENTAL_CXX0X__) || \
(defined(_MSC_VER) && _MSC_VER >= 1600))
#define LLVM_HAS_RVALUE_REFERENCES 1
#else
#define LLVM_HAS_RVALUE_REFERENCES 0
#endif
#if LLVM_HAS_RVALUE_REFERENCES
#define llvm_move(value) (::std::move(value))
#else
#define llvm_move(value) (value)
#endif
#endif

1
gen/llvmhelpers.cpp
View file

@ -20,7 +20,6 @@
#include "gen/functions.h"
#include "gen/irstate.h"
#include "gen/llvm.h"
#include "gen/llvmcompat.h"
#include "gen/logger.h"
#include "gen/nested.h"
#include "gen/mangling.h"

10
gen/naked.cpp
View file

@ -41,19 +41,19 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(Statement *stmt) LLVM_OVERRIDE {
void visit(Statement *stmt) override {
error(Loc(), "Statement not allowed in naked function");
}
//////////////////////////////////////////////////////////////////////////
void visit(AsmStatement *stmt) LLVM_OVERRIDE {
void visit(AsmStatement *stmt) override {
AsmStatement_toNakedIR(stmt, irs);
}
//////////////////////////////////////////////////////////////////////////
void visit(CompoundStatement *stmt) LLVM_OVERRIDE {
void visit(CompoundStatement *stmt) override {
IF_LOG Logger::println("CompoundStatement::toNakedIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -69,7 +69,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ExpStatement *stmt) LLVM_OVERRIDE {
void visit(ExpStatement *stmt) override {
IF_LOG Logger::println("ExpStatement::toNakedIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -118,7 +118,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(LabelStatement *stmt) LLVM_OVERRIDE {
void visit(LabelStatement *stmt) override {
IF_LOG Logger::println("LabelStatement::toNakedIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;

62
gen/statements.cpp
View file

@ -99,7 +99,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(CompoundStatement *stmt) LLVM_OVERRIDE {
void visit(CompoundStatement *stmt) override {
IF_LOG Logger::println("CompoundStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -116,7 +116,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ReturnStatement *stmt) LLVM_OVERRIDE {
void visit(ReturnStatement *stmt) override {
IF_LOG Logger::println("ReturnStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -292,7 +292,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ExpStatement *stmt) LLVM_OVERRIDE {
void visit(ExpStatement *stmt) override {
IF_LOG Logger::println("ExpStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -333,7 +333,7 @@ public:
}
}
void visit(IfStatement *stmt) LLVM_OVERRIDE {
void visit(IfStatement *stmt) override {
IF_LOG Logger::println("IfStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -413,7 +413,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ScopeStatement *stmt) LLVM_OVERRIDE {
void visit(ScopeStatement *stmt) override {
IF_LOG Logger::println("ScopeStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -429,7 +429,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(WhileStatement *stmt) LLVM_OVERRIDE {
void visit(WhileStatement *stmt) override {
IF_LOG Logger::println("WhileStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -492,7 +492,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(DoStatement *stmt) LLVM_OVERRIDE {
void visit(DoStatement *stmt) override {
IF_LOG Logger::println("DoStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -554,7 +554,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ForStatement *stmt) LLVM_OVERRIDE {
void visit(ForStatement *stmt) override {
IF_LOG Logger::println("ForStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -649,7 +649,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(BreakStatement *stmt) LLVM_OVERRIDE {
void visit(BreakStatement *stmt) override {
IF_LOG Logger::println("BreakStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -690,7 +690,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ContinueStatement *stmt) LLVM_OVERRIDE {
void visit(ContinueStatement *stmt) override {
IF_LOG Logger::println("ContinueStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -725,7 +725,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(OnScopeStatement *stmt) LLVM_OVERRIDE {
void visit(OnScopeStatement *stmt) override {
stmt->error("Internal Compiler Error: OnScopeStatement should have been "
"lowered by frontend.");
fatal();
@ -733,7 +733,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TryFinallyStatement *stmt) LLVM_OVERRIDE {
void visit(TryFinallyStatement *stmt) override {
IF_LOG Logger::println("TryFinallyStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -806,7 +806,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(TryCatchStatement *stmt) LLVM_OVERRIDE {
void visit(TryCatchStatement *stmt) override {
IF_LOG Logger::println("TryCatchStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -848,7 +848,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ThrowStatement *stmt) LLVM_OVERRIDE {
void visit(ThrowStatement *stmt) override {
IF_LOG Logger::println("ThrowStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
assert(!irs->dcomputetarget);
@ -879,7 +879,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(SwitchStatement *stmt) LLVM_OVERRIDE {
void visit(SwitchStatement *stmt) override {
IF_LOG Logger::println("SwitchStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1118,7 +1118,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(CaseStatement *stmt) LLVM_OVERRIDE {
void visit(CaseStatement *stmt) override {
IF_LOG Logger::println("CaseStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1149,7 +1149,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(DefaultStatement *stmt) LLVM_OVERRIDE {
void visit(DefaultStatement *stmt) override {
IF_LOG Logger::println("DefaultStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1180,7 +1180,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(UnrolledLoopStatement *stmt) LLVM_OVERRIDE {
void visit(UnrolledLoopStatement *stmt) override {
IF_LOG Logger::println("UnrolledLoopStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -1251,7 +1251,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ForeachStatement *stmt) LLVM_OVERRIDE {
void visit(ForeachStatement *stmt) override {
IF_LOG Logger::println("ForeachStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1389,7 +1389,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(ForeachRangeStatement *stmt) LLVM_OVERRIDE {
void visit(ForeachRangeStatement *stmt) override {
IF_LOG Logger::println("ForeachRangeStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -1497,7 +1497,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(LabelStatement *stmt) LLVM_OVERRIDE {
void visit(LabelStatement *stmt) override {
IF_LOG Logger::println("LabelStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1539,7 +1539,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(GotoStatement *stmt) LLVM_OVERRIDE {
void visit(GotoStatement *stmt) override {
IF_LOG Logger::println("GotoStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1559,7 +1559,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(GotoDefaultStatement *stmt) LLVM_OVERRIDE {
void visit(GotoDefaultStatement *stmt) override {
IF_LOG Logger::println("GotoDefaultStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -1584,7 +1584,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(GotoCaseStatement *stmt) LLVM_OVERRIDE {
void visit(GotoCaseStatement *stmt) override {
IF_LOG Logger::println("GotoCaseStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -1610,7 +1610,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(WithStatement *stmt) LLVM_OVERRIDE {
void visit(WithStatement *stmt) override {
IF_LOG Logger::println("WithStatement::toIR(): %s", stmt->loc.toChars());
LOG_SCOPE;
@ -1639,7 +1639,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(SwitchErrorStatement *stmt) LLVM_OVERRIDE {
void visit(SwitchErrorStatement *stmt) override {
IF_LOG Logger::println("SwitchErrorStatement::toIR(): %s",
stmt->loc.toChars());
LOG_SCOPE;
@ -1669,27 +1669,27 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(AsmStatement *stmt) LLVM_OVERRIDE {
void visit(AsmStatement *stmt) override {
assert(!irs->dcomputetarget);
AsmStatement_toIR(stmt, irs);
}
//////////////////////////////////////////////////////////////////////////
void visit(CompoundAsmStatement *stmt) LLVM_OVERRIDE {
void visit(CompoundAsmStatement *stmt) override {
assert(!irs->dcomputetarget);
CompoundAsmStatement_toIR(stmt, irs);
}
//////////////////////////////////////////////////////////////////////////
void visit(ImportStatement *stmt) LLVM_OVERRIDE {
void visit(ImportStatement *stmt) override {
// Empty.
}
//////////////////////////////////////////////////////////////////////////
void visit(Statement *stmt) LLVM_OVERRIDE {
void visit(Statement *stmt) override {
error(stmt->loc, "Statement type Statement not implemented: `%s`",
stmt->toChars());
fatal();
@ -1697,7 +1697,7 @@ public:
//////////////////////////////////////////////////////////////////////////
void visit(PragmaStatement *stmt) LLVM_OVERRIDE {
void visit(PragmaStatement *stmt) override {
error(stmt->loc, "Statement type PragmaStatement not implemented: `%s`",
stmt->toChars());
fatal();

2
gen/target.cpp
View file

@ -25,7 +25,7 @@
using llvm::APFloat;
void Target::_init() {
ptrsize = gDataLayout->getPointerSize(ADDRESS_SPACE);
ptrsize = gDataLayout->getPointerSize();
llvm::Type *const real = DtoType(Type::basic[Tfloat80]);
realsize = gDataLayout->getTypeAllocSize(real);