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

Merge branch 'master' into merge-2.069

Browse source
This commit is contained in:
Kai Nacke 2016-02-23 06:41:11 +01:00
commit 2d82dae628
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gen/toir.cpp
View file

@ -1194,10 +1194,11 @@ public:
// This is a bit more convoluted than it would need to be, because it // This is a bit more convoluted than it would need to be, because it
// has to take templated interface methods into account, for which // has to take templated interface methods into account, for which
// isFinalFunc is not necessarily true. // isFinalFunc is not necessarily true.
// Also, private methods are always not virtual. // Also, private/package methods are always non-virtual.
const bool nonFinal = !fdecl->isFinalFunc() && const bool nonFinal = !fdecl->isFinalFunc() &&
(fdecl->isAbstract() || fdecl->isVirtual()) && (fdecl->isAbstract() || fdecl->isVirtual()) &&
fdecl->prot().kind != PROTprivate; fdecl->prot().kind != PROTprivate &&
fdecl->prot().kind != PROTpackage;
// Get the actual function value to call. // Get the actual function value to call.
LLValue *funcval = nullptr; LLValue *funcval = nullptr;

2
tests/d2/dmd-testsuite

@ -1 +1 @@
Subproject commit 25c2a1be486b6cb60584f5a74fa978450559dbbd Subproject commit 331edbc588b60f6adee8eddb78bed97415bc95da

6
utils/gen_gccbuiltins.cpp
View file

@ -111,7 +111,11 @@ void processRecord(raw_ostream& os, Record& rec, string arch)
replace(name.begin(), name.end(), '_', '.'); replace(name.begin(), name.end(), '_', '.');
name = string("llvm.") + name; name = string("llvm.") + name;
#if LDC_LLVM_VER >= 309
ListInit* propsList = rec.getValueAsListInit("IntrProperties");
#else
ListInit* propsList = rec.getValueAsListInit("Properties"); ListInit* propsList = rec.getValueAsListInit("Properties");
#endif
string prop = string prop =
#if LDC_LLVM_VER >= 307 #if LDC_LLVM_VER >= 307
propsList->size() propsList->size()
@ -166,7 +170,7 @@ void processRecord(raw_ostream& os, Record& rec, string arch)
for(size_t i = 1; i < params.size(); i++) for(size_t i = 1; i < params.size(); i++)
os << ", " << params[i]; os << ", " << params[i];
os << ")" + attributes(rec.getValueAsListInit("Properties")) + ";\n\n"; os << ")" + attributes(propsList) + ";\n\n";
} }
std::string arch; std::string arch;