summaryrefslogtreecommitdiff
path: root/src/mir/from_hir.cpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2017-09-22 18:38:25 +0800
committerJohn Hodge <tpg@mutabah.net>2017-09-22 18:38:25 +0800
commit285116d4de4a866725f3ae9c3f282f07e5fac72e (patch)
tree0cae1ff6623d7853da93ff951f25ceb4d3673b31 /src/mir/from_hir.cpp
parentd0c9d063a1f19b64fa11c846a98d5ce46c1912d4 (diff)
downloadmrust-285116d4de4a866725f3ae9c3f282f07e5fac72e.tar.gz
Trans - Little fixes for MSVC 32-bit
Diffstat (limited to 'src/mir/from_hir.cpp')
-rw-r--r--src/mir/from_hir.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mir/from_hir.cpp b/src/mir/from_hir.cpp
index 7773a81c..8ea22cef 100644
--- a/src/mir/from_hir.cpp
+++ b/src/mir/from_hir.cpp
@@ -506,6 +506,7 @@ namespace {
TRACE_FUNCTION_F("_Asm");
::std::vector< ::std::pair< ::std::string, ::MIR::LValue> > inputs;
+ // Inputs just need to be in lvalues
for(auto& v : node.m_inputs) {
this->visit_node_ptr(v.value);
auto lv = m_builder.get_result_in_lvalue(v.value->span(), v.value->m_res_type);
@@ -513,9 +514,16 @@ namespace {
}
::std::vector< ::std::pair< ::std::string, ::MIR::LValue> > outputs;
+ // Outputs can also (sometimes) be rvalues (only for `*m`?)
for(auto& v : node.m_outputs) {
this->visit_node_ptr(v.value);
- auto lv = m_builder.get_result_unwrap_lvalue(v.value->span());
+ if( v.spec[0] != '=' )
+ ERROR(node.span(), E0000, "Assembly output specifiers must start with =");
+ ::MIR::LValue lv;
+ if(v.spec[1] == '*')
+ lv = m_builder.get_result_in_lvalue(v.value->span(), v.value->m_res_type);
+ else
+ lv = m_builder.get_result_unwrap_lvalue(v.value->span());
outputs.push_back( ::std::make_pair(v.spec, mv$(lv)) );
}