user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use black_box instead of llvm_asm (#944)

Browse source 
The implementation is the same (where possible), and it unblocks #904

Signed-off-by: Joe Richey <joerichey@google.com>
This commit is contained in:
Joseph Richey 2020-11-04 09:20:13 -08:00 • committed by GitHub
parent dd11a4b07b
commit e254082775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/stdarch/crates/assert-instr-macro/src/lib.rs
View file

@ -143,10 +143,6 @@ pub fn assert_instr(
fn #assert_name() {
#to_test
// Make sure that the shim is not removed by leaking it to unknown
// code:
unsafe { llvm_asm!("" : : "r"(#shim_name as usize) : "memory" : "volatile") };
::stdarch_test::assert(#shim_name as usize,
stringify!(#shim_name),
#instr);

8
library/stdarch/crates/stdarch-test/src/lib.rs
View file

@ -3,6 +3,7 @@
//! This basically just disassembles the current executable and then parses the
//! output once globally and then provides the `assert` function which makes
//! assertions about the disassembly of a function.
#![feature(test)] // For black_box
#![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]
extern crate assert_instr_macro;
@ -16,7 +17,7 @@ extern crate cfg_if;
pub use assert_instr_macro::*;
pub use simd_test_macro::*;
use std::{cmp, collections::HashSet, env, hash, str, sync::atomic::AtomicPtr};
use std::{cmp, collections::HashSet, env, hash, hint::black_box, str, sync::atomic::AtomicPtr};
cfg_if! {
if #[cfg(target_arch = "wasm32")] {
@ -63,7 +64,10 @@ impl hash::Hash for Function {
///
/// This asserts that the function at `fnptr` contains the instruction
/// `expected` provided.
pub fn assert(_fnptr: usize, fnname: &str, expected: &str) {
pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {
// Make sure that the shim is not removed
black_box(shim_addr);
//eprintln!("shim name: {}", fnname);
let function = &DISASSEMBLY
.get(&Function::new(fnname))