summaryrefslogtreecommitdiff
path: root/src/trans
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-09-10 21:02:07 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-09-10 21:02:07 +0800
commit9c31f71380cee5d7e6a67d2f7f805619366e2e64 (patch)
treece0a884071e5203010a9a4ddafdc7cd021ba4c0a /src/trans
parent22ce602788b285b303854a095a0c340274a76b06 (diff)
downloadmrust-9c31f71380cee5d7e6a67d2f7f805619366e2e64.tar.gz
Consteval - Remove BorrowOf in favor of BorrowPath/BorrowData
Diffstat (limited to 'src/trans')
-rw-r--r--src/trans/codegen_c.cpp10
-rw-r--r--src/trans/enumerate.cpp5
2 files changed, 12 insertions, 3 deletions
diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp
index 416aa1f9..e8643591 100644
--- a/src/trans/codegen_c.cpp
+++ b/src/trans/codegen_c.cpp
@@ -1544,7 +1544,7 @@ namespace {
(Float,
this->emit_float(e);
),
- (BorrowOf,
+ (BorrowPath,
TU_MATCHA( (e.m_data), (pe),
(Generic,
const auto& vi = m_crate.get_valitem_by_path(sp, pe.m_path);
@@ -1595,6 +1595,9 @@ namespace {
)
m_of << Trans_Mangle( params.monomorph(m_resolve, e));
),
+ (BorrowData,
+ MIR_TODO(*m_mir_res, "Handle BorrowData - " << *e);
+ ),
(String,
m_of << "{ ";
m_of << "\"" << ::std::hex;
@@ -4057,7 +4060,7 @@ namespace {
emit_dst(); m_of << " = ";
emit_literal(ty, lit, {});
),
- (BorrowOf,
+ (BorrowPath,
if( ty.m_data.is_Function() )
{
emit_dst(); m_of << " = " << Trans_Mangle(e);
@@ -4092,6 +4095,9 @@ namespace {
emit_dst(); m_of << " = &" << Trans_Mangle(e);
}
),
+ (BorrowData,
+ MIR_TODO(*m_mir_res, "Handle BorrowData - " << *e);
+ ),
(String,
emit_dst(); m_of << ".PTR = ";
m_of << "\"" << ::std::oct;
diff --git a/src/trans/enumerate.cpp b/src/trans/enumerate.cpp
index b62b21e8..54bf4ed7 100644
--- a/src/trans/enumerate.cpp
+++ b/src/trans/enumerate.cpp
@@ -1559,9 +1559,12 @@ void Trans_Enumerate_FillFrom_Literal(EnumState& state, const ::HIR::Literal& li
),
(Float,
),
- (BorrowOf,
+ (BorrowPath,
Trans_Enumerate_FillFrom_Path(state, e, pp);
),
+ (BorrowData,
+ Trans_Enumerate_FillFrom_Literal(state, *e, pp);
+ ),
(String,
)
)