mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-14 21:35:49 +00:00
Back out Pete's unreviewed change from yesterday.
Estimated hours taken: 0.2 Branches: main library/*.m Back out Pete's unreviewed change from yesterday. It doesn't compile without a recent bug fix, but no CVS tag was added.
This commit is contained in:
@@ -1064,9 +1064,6 @@ non_cc_call(P::pred(in, out, di, uo) is cc_multi, X::in, More::out,
|
||||
|
||||
").
|
||||
|
||||
get_registers(_, _, _) :-
|
||||
private_builtin__sorry("get_registers").
|
||||
|
||||
:- impure pred check_for_floundering(trail_ptr::in) is det.
|
||||
|
||||
:- pragma foreign_proc("C",
|
||||
@@ -1088,9 +1085,6 @@ get_registers(_, _, _) :-
|
||||
#endif
|
||||
").
|
||||
|
||||
check_for_floundering(_) :-
|
||||
private_builtin__sorry("check_for_floundering").
|
||||
|
||||
%
|
||||
% Discard the topmost trail ticket.
|
||||
%
|
||||
@@ -1114,9 +1108,6 @@ check_for_floundering(_) :-
|
||||
#endif
|
||||
").
|
||||
|
||||
discard_trail_ticket :-
|
||||
private_builtin__sorry("discard_trail_ticket").
|
||||
|
||||
%
|
||||
% Swap the heap with the solutions heap
|
||||
%
|
||||
@@ -1150,9 +1141,6 @@ discard_trail_ticket :-
|
||||
*/
|
||||
").
|
||||
|
||||
swap_heap_and_solutions_heap :-
|
||||
private_builtin__sorry("swap_heap_and_solutions_heap").
|
||||
|
||||
%
|
||||
% partial_deep_copy(SolutionsHeapPtr, OldVal, NewVal):
|
||||
% Make a copy of all of the parts of OldVar that occur between
|
||||
@@ -1235,9 +1223,6 @@ swap_heap_and_solutions_heap :-
|
||||
NewVal = OldVal;
|
||||
").
|
||||
|
||||
partial_deep_copy(_, _, _) :-
|
||||
private_builtin__sorry("partial_deep_copy").
|
||||
|
||||
%
|
||||
% reset_solutions_heap(SolutionsHeapPtr):
|
||||
% Reset the solutions heap pointer to the specified value,
|
||||
@@ -1248,7 +1233,7 @@ partial_deep_copy(_, _, _) :-
|
||||
|
||||
:- pragma foreign_proc("C",
|
||||
reset_solutions_heap(SolutionsHeapPtr::in),
|
||||
[will_not_call_mercury, thread_safe],
|
||||
[will_not_call_mercury, thread_safe, promise_pure],
|
||||
"
|
||||
#ifdef MR_RECLAIM_HP_ON_FAILURE
|
||||
MR_sol_hp = (MR_Word *) SolutionsHeapPtr;
|
||||
@@ -1257,7 +1242,7 @@ partial_deep_copy(_, _, _) :-
|
||||
|
||||
:- pragma foreign_proc("MC++",
|
||||
reset_solutions_heap(_SolutionsHeapPtr::in),
|
||||
[will_not_call_mercury, thread_safe],
|
||||
[will_not_call_mercury, thread_safe, promise_pure],
|
||||
"
|
||||
/*
|
||||
** For the IL back-end, we don't have a separate `solutions heap'.
|
||||
@@ -1265,10 +1250,6 @@ partial_deep_copy(_, _, _) :-
|
||||
*/
|
||||
").
|
||||
|
||||
reset_solutions_heap(_) :-
|
||||
impure private_builtin__imp,
|
||||
private_builtin__sorry("reset_solutions_heap").
|
||||
|
||||
%-----------------------------------------------------------------------------%
|
||||
|
||||
%%% :- module mutvar.
|
||||
@@ -1372,13 +1353,6 @@ XXX `ui' modes don't work yet
|
||||
Ref[0] = X;
|
||||
").
|
||||
|
||||
new_mutvar(_, _) :-
|
||||
private_builtin__sorry("new_mutvar").
|
||||
get_mutvar(_, _) :-
|
||||
private_builtin__sorry("get_mutvar").
|
||||
set_mutvar(_, _) :-
|
||||
private_builtin__sorry("set_mutvar").
|
||||
|
||||
%%% end_module mutvar.
|
||||
|
||||
%-----------------------------------------------------------------------------%
|
||||
@@ -1461,15 +1435,6 @@ unsorted_aggregate(Generator, Accumulator, Acc0, Acc) :-
|
||||
[will_not_call_mercury, thread_safe, promise_pure],
|
||||
"Y = X;").
|
||||
|
||||
semidet_succeed :-
|
||||
private_builtin__sorry("semidet_succeed").
|
||||
semidet_fail :-
|
||||
private_builtin__sorry("semidet_fail").
|
||||
|
||||
:- pragma promise_pure(cc_multi_equal/2).
|
||||
cc_multi_equal(_, _) :-
|
||||
private_builtin__sorry("cc_multi_equal").
|
||||
|
||||
%-----------------------------------------------------------------------------%
|
||||
|
||||
% We call the constructor for univs `univ_cons' to avoid ambiguity
|
||||
|
||||
Reference in New Issue
Block a user