diff options
| author | marmeladema <xademax@gmail.com> | 2020-09-23 23:38:38 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2020-09-25 22:48:44 +0100 |
| commit | 35bad3edbfd99ecf8698ac917a2582109bac5503 (patch) | |
| tree | 1678e52a7fad44e89ce2ff462f1fd8ea1e47a4f5 /compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs | |
| parent | 601c284e1e551b618cd2dbb2cc8b9a602d20e887 (diff) | |
| download | rust-35bad3edbfd99ecf8698ac917a2582109bac5503.tar.gz rust-35bad3edbfd99ecf8698ac917a2582109bac5503.zip | |
Address review comment
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs index 512fc87905e..9945d4f4282 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs @@ -8,7 +8,6 @@ use crate::llvm; use crate::llvm::debuginfo::DIScope; use rustc_hir::def_id::DefId; use rustc_hir::definitions::DefPathData; -use rustc_span::symbol::Symbol; pub fn mangled_name_of_instance<'a, 'tcx>( cx: &CodegenCx<'a, 'tcx>, @@ -28,11 +27,18 @@ pub fn item_namespace(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope { .parent .map(|parent| item_namespace(cx, DefId { krate: def_id.krate, index: parent })); + let crate_name_as_str; + let name_to_string; let namespace_name = match def_key.disambiguated_data.data { - DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate), - data => Symbol::intern(&data.to_string()), + DefPathData::CrateRoot => { + crate_name_as_str = cx.tcx.crate_name(def_id.krate).as_str(); + &*crate_name_as_str + } + data => { + name_to_string = data.to_string(); + &*name_to_string + } }; - let namespace_name = namespace_name.as_str(); let scope = unsafe { llvm::LLVMRustDIBuilderCreateNameSpace( |
