averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adapt swift for Duncan's upstream LLVM change r223802.

Browse Source 
<rdar://problem/19192991> Upstream LLVM MDNode changes break Swift

Swift SVN r23811
This commit is contained in:
Adrian Prantl
2014-12-09 20:25:43 +00:00
parent 33f41c7c51
commit 9ee65d5ff0
7 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/IRGen/IRGenModule.cpp
View File

@@ -460,7 +460,7 @@ void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
break;
}
case LibraryKind::Framework:
llvm::Value *args[] = {
llvm::Metadata *args[] = {
llvm::MDString::get(ctx, "-framework"),
llvm::MDString::get(ctx, linkLib.getName())
};
@@ -506,10 +506,10 @@ void IRGenModule::emitAutolinkInfo() {
static const char * const LinkerOptionsFlagName = "Linker Options";
// Remove duplicates.
llvm::SmallPtrSet<llvm::Value*, 4> knownAutolinkEntries;
llvm::SmallPtrSet<llvm::Metadata*, 4> knownAutolinkEntries;
AutolinkEntries.erase(std::remove_if(AutolinkEntries.begin(),
AutolinkEntries.end(),
[&](llvm::Value *entry) -> bool {
[&](llvm::Metadata *entry) -> bool {
return !knownAutolinkEntries.insert(
entry).second;
}),