From 9e2bd87bbeadd99f3c52cbfe1b6823c61b32362a Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Sun, 23 Dec 2018 01:42:19 -0500 Subject: [PATCH 1/2] Fix #170 --- Sources/LLVM/Module.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/LLVM/Module.swift b/Sources/LLVM/Module.swift index cdea1aa0..c671be4f 100644 --- a/Sources/LLVM/Module.swift +++ b/Sources/LLVM/Module.swift @@ -110,7 +110,8 @@ public final class Module: CustomStringConvertible { /// The identifier of this module. public var name: String { get { - guard let id = LLVMGetModuleIdentifier(llvm, nil) else { return "" } + var count = 0 + guard let id = LLVMGetModuleIdentifier(llvm, &count) else { return "" } return String(cString: id) } set { From 9557ef765923818453a5977ba28fddc376df9e02 Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Sun, 23 Dec 2018 01:52:11 -0500 Subject: [PATCH 2/2] Assert correct module names during Module link tests --- Tests/LLVMTests/ModuleLinkSpec.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tests/LLVMTests/ModuleLinkSpec.swift b/Tests/LLVMTests/ModuleLinkSpec.swift index e29c8ef4..f5810163 100644 --- a/Tests/LLVMTests/ModuleLinkSpec.swift +++ b/Tests/LLVMTests/ModuleLinkSpec.swift @@ -9,6 +9,7 @@ class ModuleLinkSpec : XCTestCase { // MODULE-LINK: ; ModuleID = '[[ModuleName1:ModuleLinkModuleOne]]' // MODULE-LINK-NEXT: source_filename = "[[ModuleName1]]" let module1 = Module(name: "ModuleLinkModuleOne") + XCTAssertEqual(module1.name, "ModuleLinkModuleOne") let builder1 = IRBuilder(module: module1) // MODULE-LINK: define void @moduleOne() { let mod1f = builder1.addFunction("moduleOne", @@ -25,6 +26,7 @@ class ModuleLinkSpec : XCTestCase { // MODULE-LINK: ; ModuleID = '[[ModuleName2:ModuleLinkModuleTwo]]' // MODULE-LINK-NEXT: source_filename = "[[ModuleName2]]" let module2 = Module(name: "ModuleLinkModuleTwo") + XCTAssertEqual(module2.name, "ModuleLinkModuleTwo") let builder2 = IRBuilder(module: module2) // MODULE-LINK: define void @moduleTwo() { let mod2f = builder2.addFunction("moduleTwo",