mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-04-30 07:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalize support for LLVM 10 (#3323)

Browse source
This commit is contained in:
Martin Kinkelin 2020-02-14 17:53:40 +01:00 • committed by GitHub
parent e0a91d5b76
commit 2d86e49fba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 1934 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
runtime/jit-rt/cpp-so/disassembler.cpp
View file

@ -31,6 +31,12 @@
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Target/TargetMachine.h"
#if LDC_LLVM_VER >= 1000
namespace llvm {
using std::make_unique;
}
#endif
namespace {
template <typename T> std::unique_ptr<T> unique(T *ptr) {
return std::unique_ptr<T>(ptr);
@ -122,7 +128,10 @@ void printFunction(const llvm::MCDisassembler &disasm,
std::string comment;
llvm::raw_string_ostream commentStream(comment);
auto status = disasm.getInstruction(inst, size, data.slice(pos), pos,
llvm::nulls(), commentStream);
#if LDC_LLVM_VER < 1000
llvm::nulls(),
#endif
commentStream);
switch (status) {
case llvm::MCDisassembler::Fail:
@ -340,7 +349,12 @@ void disassemble(const llvm::TargetMachine &tm,
// TODO: something more optimal
for (const auto &globalSec : object.sections()) {
#if LDC_LLVM_VER >= 1000
auto rs = globalSec.getRelocatedSection();
if (rs && *rs == secIt) {
#else
if (globalSec.getRelocatedSection() == secIt) {
#endif
processRelocations(symTable, offset, object, globalSec);
}
}