summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile10
-rw-r--r--rust-version2
-rw-r--r--rustc-1.19.0-src.patch (renamed from rust_src.patch)0
-rw-r--r--rustc-1.29.0-src.patch25
-rw-r--r--src/expand/lang_item.cpp27
-rw-r--r--src/expand/mod.cpp2
-rw-r--r--src/hir/hir.hpp1
-rw-r--r--src/hir_conv/constant_evaluation.cpp22
-rw-r--r--src/parse/types.cpp36
9 files changed, 117 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index f2067a9c..371cb640 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,6 @@ EXESUF ?=
CXX ?= g++
V ?= @
-TARGET_CC ?= clang
-
TAIL_COUNT ?= 10
# - Disable implicit rules
@@ -177,13 +175,13 @@ rustc-nightly-src.tar.gz: $(RUSTC_SRC_DES)
curl -sS https://static.rust-lang.org/dist/$${DL_RUST_DATE}/rustc-nightly-src.tar.gz -o rustc-nightly-src.tar.gz
# TODO: Handle non-nightly download
-$(RUSTC_SRC_DL): rust-nightly-date rustc-nightly-src.tar.gz rust_src.patch
+$(RUSTC_SRC_DL): rust-nightly-date rustc-nightly-src.tar.gz rustc-nightly-src.patch
@export DL_RUST_DATE=$$(cat rust-nightly-date); \
export DISK_RUST_DATE=$$([ -f $(RUSTC_SRC_DL) ] && cat $(RUSTC_SRC_DL)); \
if [ "$$DL_RUST_DATE" != "$$DISK_RUST_DATE" ]; then \
rm -rf rustc-nightly-src; \
tar -xf rustc-nightly-src.tar.gz; \
- cd $(RUSTSRC) && patch -p0 < ../rust_src.patch; \
+ cd $(RUSTSRC) && patch -p0 < ../rustc-nightly-src.patch; \
fi
cat rust-nightly-date > $(RUSTC_SRC_DL)
else
@@ -192,9 +190,9 @@ $(RUSTC_SRC_TARBALL): $(RUSTC_SRC_DES)
@echo [CURL] $@
@rm -f $@
@curl -sS https://static.rust-lang.org/dist/$@ -o $@
-$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rust_src.patch
+$(RUSTC_SRC_DL): $(RUSTC_SRC_TARBALL) rustc-$(shell cat $(RUSTC_SRC_DES))-src.patch
tar -xf $(RUSTC_SRC_TARBALL)
- cd $(RUSTCSRC) && patch -p0 < ../rust_src.patch;
+ cd $(RUSTCSRC) && patch -p0 < ../rustc-$(shell cat $(RUSTC_SRC_DES))-src.patch;
cat $(RUSTC_SRC_DES) > $(RUSTC_SRC_DL)
endif
diff --git a/rust-version b/rust-version
index 815d5ca0..5e57fb89 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1.19.0
+1.29.0
diff --git a/rust_src.patch b/rustc-1.19.0-src.patch
index 1cc13242..1cc13242 100644
--- a/rust_src.patch
+++ b/rustc-1.19.0-src.patch
diff --git a/rustc-1.29.0-src.patch b/rustc-1.29.0-src.patch
new file mode 100644
index 00000000..df6ef8f5
--- /dev/null
+++ b/rustc-1.29.0-src.patch
@@ -0,0 +1,25 @@
+--- src/libcore/intrinsics.rs
++++ src/libcore/intrinsics.rs
+@@ -678,5 +678,9 @@
+ pub fn min_align_of_val<T: ?Sized>(_: &T) -> usize;
+
++ /// Obtain the length of a slice pointer
++ #[cfg(rust_compiler="mrustc")]
++ pub fn mrustc_slice_len<T>(pointer: *const [T]) -> usize;
++
+ /// Gets a static string slice containing the name of a type.
+ pub fn type_name<T: ?Sized>() -> &'static str;
+
+--- src/libcore/slice/mod.rs
++++ src/libcore/slice/mod.rs
+@@ -413,5 +413,7 @@
+ pub const fn len(&self) -> usize {
+- unsafe {
+- Repr { rust: self }.raw.len
+- }
++ #[cfg(not(rust_compiler="mrustc"))]
++ let rv = unsafe { Repr { rust: self }.raw.len };
++ #[cfg(rust_compiler="mrustc")]
++ let rv = unsafe { ::intrinsics::mrustc_slice_len(self) };
++ rv
+ }
diff --git a/src/expand/lang_item.cpp b/src/expand/lang_item.cpp
index 62527ac9..0bdd37e5 100644
--- a/src/expand/lang_item.cpp
+++ b/src/expand/lang_item.cpp
@@ -88,6 +88,7 @@ void handle_lang_item(const Span& sp, AST::Crate& crate, const AST::Path& path,
else if( name == "unsafe_cell" ) { }
else if( TARGETVER_1_29 && name == "alloc_layout") { }
else if( TARGETVER_1_29 && name == "panic_info" ) {} // Struct
+ else if( TARGETVER_1_29 && name == "manually_drop" ) {} // Struct
// Generators
else if( TARGETVER_1_29 && name == "generator" ) {} // - Trait
@@ -114,6 +115,32 @@ void handle_lang_item(const Span& sp, AST::Crate& crate, const AST::Path& path,
else if( name == "start" ) { }
else if( name == "eh_personality" ) { }
+ // libcompiler_builtins
+ // - i128/u128 helpers (not used by mrustc)
+ else if( name == "i128_add" ) { }
+ else if( name == "i128_addo" ) { }
+ else if( name == "u128_add" ) { }
+ else if( name == "u128_addo" ) { }
+ else if( name == "i128_sub" ) { }
+ else if( name == "i128_subo" ) { }
+ else if( name == "u128_sub" ) { }
+ else if( name == "u128_subo" ) { }
+ else if( name == "i128_mul" ) { }
+ else if( name == "i128_mulo" ) { }
+ else if( name == "u128_mul" ) { }
+ else if( name == "u128_mulo" ) { }
+ else if( name == "i128_div" ) { }
+ else if( name == "i128_rem" ) { }
+ else if( name == "u128_div" ) { }
+ else if( name == "u128_rem" ) { }
+ else if( name == "i128_shl" ) { }
+ else if( name == "i128_shlo" ) { }
+ else if( name == "u128_shl" ) { }
+ else if( name == "u128_shlo" ) { }
+ else if( name == "i128_shr" ) { }
+ else if( name == "i128_shro" ) { }
+ else if( name == "u128_shr" ) { }
+ else if( name == "u128_shro" ) { }
else {
ERROR(sp, E0000, "Unknown language item '" << name << "'");
diff --git a/src/expand/mod.cpp b/src/expand/mod.cpp
index a0cc3f7b..66a7308a 100644
--- a/src/expand/mod.cpp
+++ b/src/expand/mod.cpp
@@ -772,6 +772,7 @@ struct CExpandExpr:
case ::AST::ExprNode_BinOp::RANGE_INC: {
// NOTE: Not language items
auto core_crate = (crate.m_load_std == ::AST::Crate::LOAD_NONE ? "" : "core");
+ auto path_None = ::AST::Path(core_crate, { ::AST::PathNode("option"), ::AST::PathNode("Option"), ::AST::PathNode("None") });
auto path_RangeInclusive_NonEmpty = ::AST::Path(core_crate, { ::AST::PathNode("ops"), ::AST::PathNode("RangeInclusive") });
auto path_RangeToInclusive = ::AST::Path(core_crate, { ::AST::PathNode("ops"), ::AST::PathNode("RangeToInclusive") });
@@ -780,6 +781,7 @@ struct CExpandExpr:
::AST::ExprNode_StructLiteral::t_values values;
values.push_back({ {}, "start", mv$(node.m_left) });
values.push_back({ {}, "end" , mv$(node.m_right) });
+ values.push_back({ {}, "is_empty", ::AST::ExprNodeP(new ::AST::ExprNode_NamedValue(mv$(path_None))) });
replacement.reset( new ::AST::ExprNode_StructLiteral(mv$(path_RangeInclusive_NonEmpty), nullptr, mv$(values)) );
}
else
diff --git a/src/hir/hir.hpp b/src/hir/hir.hpp
index daa27d10..d693c61d 100644
--- a/src/hir/hir.hpp
+++ b/src/hir/hir.hpp
@@ -50,6 +50,7 @@ struct VisEnt
/// NOTE: Intentionally minimal, just covers the values (not the types)
TAGGED_UNION(Literal, Invalid,
(Invalid, struct {}),
+ (Defer, struct {}),
// List = Array, Tuple, struct literal
(List, ::std::vector<Literal>), // TODO: Have a variant for repetition lists
// Variant = Enum variant
diff --git a/src/hir_conv/constant_evaluation.cpp b/src/hir_conv/constant_evaluation.cpp
index a2847e04..34830f79 100644
--- a/src/hir_conv/constant_evaluation.cpp
+++ b/src/hir_conv/constant_evaluation.cpp
@@ -15,6 +15,8 @@
#include <mir/helpers.hpp>
#include <trans/target.hpp>
+#define CHECK_DEFER(var) do { if( var.is_Defer() ) { m_rv = ::HIR::Literal::make_Defer({}); return ; } } while(0)
+
namespace {
typedef ::std::vector< ::std::pair< ::std::string, ::HIR::Static> > t_new_values;
@@ -332,10 +334,12 @@ namespace {
TRACE_FUNCTION_F("_BinOp");
node.m_left->visit(*this);
+ CHECK_DEFER(m_rv);
auto left = mv$(m_rv);
auto ret_type = mv$(m_rv_type);
node.m_right->visit(*this);
+ CHECK_DEFER(m_rv);
auto right = mv$(m_rv);
if( left.tag() != right.tag() ) {
@@ -601,6 +605,7 @@ namespace {
::std::vector< ::HIR::Literal> vals;
for(const auto& vn : node.m_args ) {
vn->visit(*this);
+ CHECK_DEFER(m_rv);
assert( !m_rv.is_Invalid() );
vals.push_back( mv$(m_rv) );
}
@@ -824,7 +829,13 @@ namespace {
auto ep = get_ent_fullpath(node.span(), m_crate, node.m_path, EntNS::Value);
TU_MATCH_DEF( EntPtr, (ep), (e),
(
- BUG(node.span(), "Path value with unsupported value type - " << ep.tag_str());
+ BUG(node.span(), "_PathValue(" << node.m_path << ") with unsupported value type - " << ep.tag_str());
+ ),
+ (NotFound,
+ // If the value can't be found, and it's an associated constant, return a literal indicating
+ // that the value can't yet be evaluated.
+ DEBUG(node.span() << " - _PathValue(" << node.m_path << ") not found");
+ m_rv = ::HIR::Literal::make_Defer({});
),
(Static,
// TODO: Should be a more complex path to support associated paths
@@ -915,6 +926,7 @@ namespace {
}
val_set.second->visit(*this);
+ CHECK_DEFER(m_rv);
vals[idx] = mv$(m_rv);
}
for( unsigned int i = 0; i < vals.size(); i ++ ) {
@@ -962,6 +974,7 @@ namespace {
m_exp_type = mv$(exp_tys[i]);
node.m_vals[i]->visit(*this);
+ CHECK_DEFER(m_rv);
assert( !m_rv.is_Invalid() );
vals.push_back( mv$(m_rv) );
@@ -994,6 +1007,7 @@ namespace {
{
m_exp_type = exp_inner_ty.clone();
vn->visit(*this);
+ CHECK_DEFER(m_rv);
assert( !m_rv.is_Invalid() );
vals.push_back( mv$(m_rv) );
}
@@ -1029,6 +1043,7 @@ namespace {
{
m_exp_type = mv$(exp_inner_ty);
node.m_val->visit(*this);
+ CHECK_DEFER(m_rv);
assert( !m_rv.is_Invalid() );
for(unsigned int i = 0; i < count-1; i ++)
{
@@ -1285,6 +1300,11 @@ namespace {
(BinOp,
auto inval_l = read_param(e.val_l);
auto inval_r = read_param(e.val_r);
+ if( inval_l.is_Invalid() || inval_r.is_Invalid() )
+ {
+ val = ::HIR::Literal::make_Invalid({});
+ break ;
+ }
ASSERT_BUG(sp, inval_l.tag() == inval_r.tag(), "Mismatched literal types in binop - " << inval_l << " and " << inval_r);
TU_MATCH_DEF( ::HIR::Literal, (inval_l, inval_r), (l, r),
(
diff --git a/src/parse/types.cpp b/src/parse/types.cpp
index a07e66f8..db66a77e 100644
--- a/src/parse/types.cpp
+++ b/src/parse/types.cpp
@@ -15,6 +15,7 @@
TypeRef Parse_Type_Int(TokenStream& lex, bool allow_trait_list);
TypeRef Parse_Type_Fn(TokenStream& lex, AST::HigherRankedBounds hrbs = {});
TypeRef Parse_Type_Path(TokenStream& lex, AST::HigherRankedBounds hrbs, bool allow_trait_list);
+TypeRef Parse_Type_TraitObject(TokenStream& lex, ::AST::HigherRankedBounds hrbs = {});
TypeRef Parse_Type_ErasedType(TokenStream& lex, bool allow_trait_list);
// === CODE ===
@@ -84,6 +85,10 @@ TypeRef Parse_Type_Int(TokenStream& lex, bool allow_trait_list)
// TODO: path macros
return TypeRef(TypeRef::TagMacro(), Parse_MacroInvocation(ps, mv$(tok.str()), lex));
}
+ if( TARGETVER_1_29 && tok.str() == "dyn" )
+ {
+ return Parse_Type_TraitObject(lex, {});
+ }
// or a primitive
//if( auto ct = coretype_fromstring(tok.str()) )
//{
@@ -311,6 +316,37 @@ TypeRef Parse_Type_Path(TokenStream& lex, ::AST::HigherRankedBounds hrbs, bool a
}
}
}
+TypeRef Parse_Type_TraitObject(TokenStream& lex, ::AST::HigherRankedBounds hrbs)
+{
+ Token tok;
+ auto ps = lex.start_span();
+
+ ::std::vector<Type_TraitPath> traits;
+ ::std::vector<AST::LifetimeRef> lifetimes;
+
+ traits.push_back(Type_TraitPath { mv$(hrbs), Parse_Path(lex, PATH_GENERIC_TYPE) });
+
+ while( lex.lookahead(0) == TOK_PLUS )
+ {
+ GET_CHECK_TOK(tok, lex, TOK_PLUS);
+ if( LOOK_AHEAD(lex) == TOK_LIFETIME ) {
+ GET_TOK(tok, lex);
+ lifetimes.push_back(AST::LifetimeRef( /*lex.point_span(),*/ lex.get_ident(mv$(tok)) ));
+ }
+ else
+ {
+ if( lex.lookahead(0) == TOK_RWORD_FOR )
+ {
+ hrbs = Parse_HRB(lex);
+ }
+ traits.push_back({ mv$(hrbs), Parse_Path(lex, PATH_GENERIC_TYPE) });
+ }
+ }
+
+ if( lifetimes.empty())
+ lifetimes.push_back(AST::LifetimeRef());
+ return TypeRef(lex.end_span(ps), mv$(traits), mv$(lifetimes));
+}
TypeRef Parse_Type_ErasedType(TokenStream& lex, bool allow_trait_list)
{
Token tok;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 03:14:04 +0000