Skip to content

Commit 8f3551f

Browse files
authored
Merge pull request #202 from maleadt/tb/string
Implement Base.string instead of convert(::String).
2 parents d8ccb93 + 3e0df74 commit 8f3551f

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

src/core/metadata.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MDString(val::String) = MDString(API.LLVMMDString(val, length(val)))
1515
MDString(val::String, ctx::Context) =
1616
MDString(API.LLVMMDStringInContext(ctx, val, length(val)))
1717

18-
function Base.convert(::Type{String}, md::MDString)
18+
function Base.string(md::MDString)
1919
len = Ref{Cuint}()
2020
ptr = API.LLVMGetMDString(md, len)
2121
ptr == C_NULL && throw(ArgumentError("invalid metadata, not a MDString?"))

src/core/module.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function Module(f::Core.Function, args...)
3939
end
4040

4141
function Base.show(io::IO, mod::Module)
42-
output = convert(String, mod)
42+
output = string(mod)
4343
print(io, output)
4444
end
4545

src/datalayout.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ end
2525

2626
dispose(data::DataLayout) = API.LLVMDisposeTargetData(data)
2727

28-
Base.convert(::Type{String}, data::DataLayout) =
28+
Base.string(data::DataLayout) =
2929
unsafe_message(API.LLVMCopyStringRepOfTargetData(data))
3030

3131
function Base.show(io::IO, data::DataLayout)
32-
@printf(io, "DataLayout(%s)", convert(String, data))
32+
@printf(io, "DataLayout(%s)", string(data))
3333
end
3434

3535
byteorder(data::DataLayout) = API.LLVMByteOrder(data)

src/interop/base.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function call_function(llvmf::LLVM.Function, rettyp::Type=Nothing, argtyp::Type=
6464
args::Expr=:())
6565
if VERSION >= v"1.6.0-DEV.674"
6666
mod = LLVM.parent(llvmf)
67-
ir = convert(String, mod)
67+
ir = string(mod)
6868
fn = LLVM.name(llvmf)
6969
@assert !isempty(fn)
7070
quote

src/ir.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ end
1919

2020
## writer
2121

22-
Base.convert(::Type{String}, mod::Module) = unsafe_message(API.LLVMPrintModuleToString(mod))
22+
Base.string(mod::Module) = unsafe_message(API.LLVMPrintModuleToString(mod))

test/core.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ end
488488

489489
Context() do ctx
490490
str = MDString("foo", ctx)
491-
@test convert(String, str) == "foo"
491+
@test string(str) == "foo"
492492
end
493493

494494
@test MDNode([MDString("foo")]) == MDNode([MDString("foo", global_ctx)], global_ctx)
@@ -540,7 +540,7 @@ LLVM.Module("SomeModule", ctx) do mod
540540

541541
dummyLayout = "e-p:64:64:64"
542542
datalayout!(mod, dummyLayout)
543-
@test convert(String, datalayout(mod)) == dummyLayout
543+
@test string(datalayout(mod)) == dummyLayout
544544

545545
if LLVM.version() >= v"8.0"
546546
md = Metadata(ConstantInt(42, ctx))

test/datalayout.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Context() do ctx
44
DataLayout("E-p:32:32-f128:128:128") do data
5-
@test convert(String, data) == "E-p:32:32-f128:128:128"
5+
@test string(data) == "E-p:32:32-f128:128:128"
66

77
@test occursin("E-p:32:32-f128:128:128", sprint(io->show(io,data)))
88

@@ -21,7 +21,7 @@ DataLayout("E-p:32:32-f128:128:128") do data
2121
@test preferred_alignment(data, gv) == 4
2222

2323
datalayout!(mod, data)
24-
@test convert(String, datalayout(mod)) == convert(String, data)
24+
@test string(datalayout(mod)) == string(data)
2525
end
2626

2727
elem = [LLVM.Int32Type(ctx), LLVM.FloatType(ctx)]

test/ir.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ LLVM.Module("SomeModule", ctx) do source_mod
1717
ret!(builder)
1818

1919
verify(source_mod)
20-
2120

22-
ir = convert(String, source_mod)
21+
22+
ir = string(source_mod)
2323

2424
let
2525
mod = parse(LLVM.Module, ir)

0 commit comments

Comments
 (0)