Update src/librustc_mir/interpret/intrinsics.rs

nbdd0121 · oli-obk · web-flow · commit 8b43012453de · 2020-06-27T18:24:46.000+01:00
Co-authored-by: Oliver Scherer &lt;github35764891676564198441@oli-obk.de&gt;
diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs
@@ -401,8 +401,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             }
             sym::likely | sym::unlikely => {
                 // These just return their argument
-                let a = self.read_immediate(args[0])?;
-                self.write_immediate(*a, dest)?;
+                self.copy_op(args[0], dest)?;
             }
             // FIXME(#73156): Handle source code coverage in const eval
             sym::count_code_region => (),

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {`
`401`	`401`	`}`
`402`	`402`	`sym::likely \| sym::unlikely => {`
`403`	`403`	`// These just return their argument`
`404`		`- let a = self.read_immediate(args[0])?;`
`405`		`- self.write_immediate(*a, dest)?;`
	`404`	`+ self.copy_op(args[0], dest)?;`
`406`	`405`	`}`
`407`	`406`	`// FIXME(#73156): Handle source code coverage in const eval`
`408`	`407`	`sym::count_code_region => (),`