Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix double evaluation of read+write operands
Stop read+write expressions from expanding into two occurences in the AST. Add a bool to indicate whether an operand in output position if read+write or not. Fixes #14936
- Loading branch information
Showing
12 changed files
with
105 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
#![feature(asm, macro_rules)] | ||
|
||
type History = Vec<&'static str>; | ||
|
||
fn wrap<A>(x:A, which: &'static str, history: &mut History) -> A { | ||
history.push(which); | ||
x | ||
} | ||
|
||
macro_rules! demo { | ||
( $output_constraint:tt ) => { | ||
{ | ||
let mut x: int = 0; | ||
let y: int = 1; | ||
|
||
let mut history: History = vec!(); | ||
unsafe { | ||
asm!("mov ($1), $0" | ||
: $output_constraint (*wrap(&mut x, "out", &mut history)) | ||
: "r"(&wrap(y, "in", &mut history))); | ||
} | ||
assert_eq!((x,y), (1,1)); | ||
assert_eq!(history.as_slice(), &["out", "in"]); | ||
} | ||
} | ||
} | ||
|
||
#[cfg(target_arch = "x86")] | ||
#[cfg(target_arch = "x86_64")] | ||
fn main() { | ||
fn out_write_only_expr_then_in_expr() { | ||
demo!("=r") | ||
} | ||
|
||
fn out_read_write_expr_then_in_expr() { | ||
demo!("+r") | ||
} | ||
|
||
out_write_only_expr_then_in_expr(); | ||
out_read_write_expr_then_in_expr(); | ||
} | ||
|
||
#[cfg(not(target_arch = "x86"), not(target_arch = "x86_64"))] | ||
pub fn main() {} |
4155643
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at pczarn@4155643
4155643
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging pczarn/rust/inline-asm = 4155643 into auto
4155643
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pczarn/rust/inline-asm = 4155643 merged ok, testing candidate = 4be4ea7
4155643
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/922
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/922
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/921
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/922
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/917
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/918
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/917
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/923
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/918
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/917
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/920
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/918
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/918
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/919
4155643
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 4be4ea7