diff options
| author | John Hodge <tpg@mutabah.net> | 2019-10-27 19:33:59 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2019-10-27 19:33:59 +0800 |
| commit | dc806b29ce79d6ba40aca85bbdc5640261070910 (patch) | |
| tree | cf472f17fe51ae2ac3f3cb1b478570a22bf87d12 /src/hir/from_ast.cpp | |
| parent | fd19c0f181ab979472298ddffb00f2991e5d25e5 (diff) | |
| download | mrust-dc806b29ce79d6ba40aca85bbdc5640261070910.tar.gz | |
MSVC - General compilation fixes, `hello.exe` building and running
Diffstat (limited to 'src/hir/from_ast.cpp')
| -rw-r--r-- | src/hir/from_ast.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hir/from_ast.cpp b/src/hir/from_ast.cpp index 4cde40fc..e3cba9e9 100644 --- a/src/hir/from_ast.cpp +++ b/src/hir/from_ast.cpp @@ -959,8 +959,8 @@ namespace { } else if( repr_str == "align" ) { //ASSERT_BUG(a.span(), a.has_string(), "#[repr(aligned)] attribute malformed, " << *attr_repr); - ASSERT_BUG(a.span(), rv.m_repr == ::HIR::Struct::Repr::Rust, "Conflicting #[repr] attributes - " << rv.m_repr << ", " << repr_str); - rv.m_repr = ::HIR::Struct::Repr::Aligned; + ASSERT_BUG(a.span(), rv.m_repr != ::HIR::Struct::Repr::Packed, "Conflicting #[repr] attributes - " << rv.m_repr << ", " << repr_str); + //rv.m_repr = ::HIR::Struct::Repr::Aligned; //rv.m_forced_alignment = ::std::stol(a.string()); } else { |