diff options
| author | bors <bors@rust-lang.org> | 2017-05-28 12:01:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-28 12:01:02 +0000 |
| commit | 924898f88a687d381b83fc1ba5bce8cad424ebc8 (patch) | |
| tree | acade8ee33a526fb96abad74bc3bff272f544b59 /src/rustllvm/RustWrapper.cpp | |
| parent | 41e74a2282752499ebd9e2444f9b710d92fd0e64 (diff) | |
| parent | ee982d4355a10790993ab65f80730ba75395e140 (diff) | |
| download | rust-924898f88a687d381b83fc1ba5bce8cad424ebc8.tar.gz rust-924898f88a687d381b83fc1ba5bce8cad424ebc8.zip | |
Auto merge of #41917 - arielb1:mir-array, r=nagisa
Translate array drop glue using MIR I was a bit lazy here and used a usize-based index instead of a pointer iteration. Do you think this is important @eddyb? r? @eddyb
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index c24867224ea..838c180c70b 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -781,11 +781,15 @@ extern "C" void LLVMRustWriteTypeToString(LLVMTypeRef Ty, RustStringRef Str) { extern "C" void LLVMRustWriteValueToString(LLVMValueRef V, RustStringRef Str) { RawRustStringOstream OS(Str); - OS << "("; - unwrap<llvm::Value>(V)->getType()->print(OS); - OS << ":"; - unwrap<llvm::Value>(V)->print(OS); - OS << ")"; + if (!V) { + OS << "(null)"; + } else { + OS << "("; + unwrap<llvm::Value>(V)->getType()->print(OS); + OS << ":"; + unwrap<llvm::Value>(V)->print(OS); + OS << ")"; + } } extern "C" bool LLVMRustLinkInExternalBitcode(LLVMModuleRef DstRef, char *BC, |