bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove LocalInternedString uses from librustc_codegen_llvm/consts.rs.

Browse source
This commit is contained in:
Nicholas Nethercote 2019-09-03 16:11:18 +10:00
parent 0ad111f8bb
commit b50db34e4d
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_codegen_llvm/consts.rs
View file

@ -11,12 +11,11 @@ use rustc::mir::interpret::{ConstValue, Allocation, read_target_uint,
Pointer, ErrorHandled, GlobalId}; Pointer, ErrorHandled, GlobalId};
use rustc::mir::mono::MonoItem; use rustc::mir::mono::MonoItem;
use rustc::hir::Node; use rustc::hir::Node;
use syntax_pos::Span;
use rustc_target::abi::HasDataLayout; use rustc_target::abi::HasDataLayout;
use syntax::symbol::sym;
use syntax_pos::symbol::LocalInternedString;
use rustc::ty::{self, Ty, Instance}; use rustc::ty::{self, Ty, Instance};
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
use syntax::symbol::{Symbol, sym};
use syntax_pos::Span;
use rustc::ty::layout::{self, Size, Align, LayoutOf}; use rustc::ty::layout::{self, Size, Align, LayoutOf};
@ -104,10 +103,11 @@ fn check_and_apply_linkage(
cx: &CodegenCx<'ll, 'tcx>, cx: &CodegenCx<'ll, 'tcx>,
attrs: &CodegenFnAttrs, attrs: &CodegenFnAttrs,
ty: Ty<'tcx>, ty: Ty<'tcx>,
sym: LocalInternedString, sym: Symbol,
span: Span span: Span
) -> &'ll Value { ) -> &'ll Value {
let llty = cx.layout_of(ty).llvm_type(cx); let llty = cx.layout_of(ty).llvm_type(cx);
let sym = sym.as_str();
if let Some(linkage) = attrs.linkage { if let Some(linkage) = attrs.linkage {
debug!("get_static: sym={} linkage={:?}", sym, linkage); debug!("get_static: sym={} linkage={:?}", sym, linkage);
@ -203,7 +203,7 @@ impl CodegenCx<'ll, 'tcx> {
def_id); def_id);
let ty = instance.ty(self.tcx); let ty = instance.ty(self.tcx);
let sym = self.tcx.symbol_name(instance).name.as_str(); let sym = self.tcx.symbol_name(instance).name.as_symbol();
debug!("get_static: sym={} instance={:?}", sym, instance); debug!("get_static: sym={} instance={:?}", sym, instance);
@ -214,11 +214,12 @@ impl CodegenCx<'ll, 'tcx> {
Node::Item(&hir::Item { Node::Item(&hir::Item {
ref attrs, span, node: hir::ItemKind::Static(..), .. ref attrs, span, node: hir::ItemKind::Static(..), ..
}) => { }) => {
if self.get_declared_value(&sym[..]).is_some() { let sym_str = sym.as_str();
if self.get_declared_value(&sym_str).is_some() {
span_bug!(span, "Conflicting symbol names for static?"); span_bug!(span, "Conflicting symbol names for static?");
} }
let g = self.define_global(&sym[..], llty).unwrap(); let g = self.define_global(&sym_str, llty).unwrap();
if !self.tcx.is_reachable_non_generic(def_id) { if !self.tcx.is_reachable_non_generic(def_id) {
unsafe { unsafe {