Fix emulate intrinsics return type.

skinnyBat · skinnyBat · commit 99a864be39d5 · 2020-02-15T14:45:36.000+13:00
diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs
@@ -110,8 +110,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             | sym::type_id
             | sym::type_name => {
                 let gid = GlobalId { instance, promoted: None };
-                let ty = instance.ty_env(*self.tcx, self.param_env);
-                let val = self.const_eval(gid, ty)?;
+                let val = self.const_eval(gid, dest.layout.ty)?;
                 self.copy_op(val, dest)?;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {`
`110`	`110`	`\| sym::type_id`
`111`	`111`	`\| sym::type_name => {`
`112`	`112`	`let gid = GlobalId { instance, promoted: None };`
`113`		`- let ty = instance.ty_env(*self.tcx, self.param_env);`
`114`		`- let val = self.const_eval(gid, ty)?;`
	`113`	`+ let val = self.const_eval(gid, dest.layout.ty)?;`
`115`	`114`	`self.copy_op(val, dest)?;`
`116`	`115`	`}`
`117`	`116`