diff options
Diffstat (limited to 'src/trans')
| -rw-r--r-- | src/trans/codegen_c.cpp | 6 | ||||
| -rw-r--r-- | src/trans/target.cpp | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp index 5df20334..59687636 100644 --- a/src/trans/codegen_c.cpp +++ b/src/trans/codegen_c.cpp @@ -1127,6 +1127,12 @@ namespace { m_of << ".PTR"; } } + else if( const auto* te = ty->m_data.opt_Pointer() ) + { + if( metadata_type(*te->inner) != MetadataType::None ) { + m_of << ".PTR"; + } + } } void emit_enum(const Span& sp, const ::HIR::GenericPath& p, const ::HIR::Enum& item) override diff --git a/src/trans/target.cpp b/src/trans/target.cpp index 81dc8c0c..7aa46b35 100644 --- a/src/trans/target.cpp +++ b/src/trans/target.cpp @@ -876,6 +876,13 @@ namespace { return true; } } + // Handle the NonZero lang item (TODO: Cleaner?) + if( te.path.m_data.as_Generic().m_path == resolve.m_crate.get_lang_item_path(sp, "non_zero") ) + { + out_path.sub_fields.push_back(0); + out_path.size = r->size; + return true; + } } } break; TU_ARM(ty.m_data, Borrow, _te) { (void)_te; @@ -919,6 +926,7 @@ namespace { { nz_path.index = 1; ::std::reverse(nz_path.sub_fields.begin(), nz_path.sub_fields.end()); + DEBUG("nz_path = " << nz_path.sub_fields); size_t max_size = 0; size_t max_align = 0; for(auto& t : mono_types) |