diff options
| author | bors <bors@rust-lang.org> | 2019-05-31 10:42:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-31 10:42:31 +0000 |
| commit | db4c783319d60ba2e4c93ac0b6a295f345a9c544 (patch) | |
| tree | dcb933ba4beb1ff0493e1157998aed62f0c5c2ab /src/librustc_codegen_llvm | |
| parent | 3ade426ede7bca4a74bc641a12f2e7fe2cc20c47 (diff) | |
| parent | 5b9848912a85e28d000602fc2e81bad9c2f2a981 (diff) | |
| download | rust-db4c783319d60ba2e4c93ac0b6a295f345a9c544.tar.gz rust-db4c783319d60ba2e4c93ac0b6a295f345a9c544.zip | |
Auto merge of #60166 - oli-obk:type_name, r=eddyb
Make the `type_name` intrinsic deterministic cc @eddyb for the printing infrastructure cc @Centril for the deterministic (coherent?) output r? @sfackler
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/intrinsic.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs index 9ae0e26196d..060c295eb7a 100644 --- a/src/librustc_codegen_llvm/intrinsic.rs +++ b/src/librustc_codegen_llvm/intrinsic.rs @@ -20,7 +20,6 @@ use rustc::ty::layout::{self, LayoutOf, HasTyCtxt, Primitive}; use rustc_codegen_ssa::common::{IntPredicate, TypeKind}; use rustc::hir; use syntax::ast::{self, FloatTy}; -use syntax::symbol::LocalInternedString; use rustc_codegen_ssa::traits::*; @@ -213,8 +212,8 @@ impl IntrinsicCallMethods<'tcx> for Builder<'a, 'll, 'tcx> { } "type_name" => { let tp_ty = substs.type_at(0); - let ty_name = LocalInternedString::intern(&tp_ty.to_string()); - self.const_str_slice(ty_name) + let ty_name = rustc_mir::interpret::type_name(self.tcx, tp_ty); + OperandRef::from_const(self, ty_name).immediate_or_packed_pair(self) } "type_id" => { self.const_u64(self.tcx.type_id_hash(substs.type_at(0))) |
