2 Commits

Author	SHA1	Message	Date
Zoltan Somogyi	56509009dd	Fix some test failures in debug grades. ... browser/declarative_oracle.m: The code that checks whether the declarative debugger should trust a module because it is a standard library module was apparently written before any of module in the standard library had submodules, because it checked the unqualified name of the module in question against the *qualified* module names returned by the mercury_std_library_module predicate. For a long time after we had submodules such as thread.mvar.m in the standard library, this caused no test failures, because our tests did not execute code in those submodules. This changed with the breakup of io.m. The move of the output_stream_2 predicate from io.m, which this code recognized as trusted, to io.stream_ops.m, which it did not, caused the declarative debugger to ask questions about the validity of calls to it, which the caused the failure of the declarative_debugger/ all_trusted test case, due to its .inp file containing something other than the corresponding answers. Fix this for the case of module names of the forms a.b and a.b.c. library/library.m: Add a note to the mercury_std_library_module predicate to update the code in declarative_oracle.m if we ever add a library module whose fully qualified name has the form a.b.c.d. tests/debugger/user_event_shallow.exp: Update the expected output of this test for some ancient change. tests/debugger/Mercury.options: Specify the optimization level for the user_event_shallow test, which eliminates one source of variability in the output. Another source is intermodule optimization, which this diff does *not* eliminate. tests/debugger/all_solutions.exp: tests/debugger/all_solutions.exp2: tests/debugger/all_solutions.exp3: tests/debugger/all_solutions.exp4: tests/debugger/all_solutions.m: The output of this test case in debug grades with intermodule optimization did not match any of the .exp* files, though it differed from .exp2 only in the text of an error message. (The difference was not a bug.) Instead of adding this expected output as .exp5, use it to replace the .exp3 file. This expected output file could not have been matched in the last seven years, because it expects main/2 to be on line 16, and that predicate's context has been line 20 since 2015. Document the fact that .exp3 is the expected output for debug grade bootchecks with intermodule optimization. This documentation changes line numbers yet again, so update the line numbers in all the *other* .exp* files as well. tests/declarative_debugger/Mmakefile: Fix indentation.	2022-06-26 10:09:48 +10:00
Zoltan Somogyi	168500343c	This change adds new facilities for debugging minimal model tabling, and ... Estimated hours taken: 160 Branches: main This change adds new facilities for debugging minimal model tabling, and has several bug fixes found with the aid of those facilities. Most of the diff affects the behavior of the system only in minimal model grades and/or when debugging flags are defined. compiler/ite_gen.m: In minimal model grades, surround the conditions of if-then-elses with calls to three functions. These functions detect when a condition fails due to one or more suspensions, and abort the program. (After resumptions, the condition may actually have solutions, but by then the computation has committed to the wrong path.) compiler/table_gen.m: Change the program transformation for model_non predicates to use a switch instead of nested if-then-elses, to avoid the overhead of wrapping the condition. The version with switches is also a bit easier to debug. The transformation for model_det and model_semi predicates stays as before, because for such predicates finding the status (which we want to switch on) requires computation, not just a lookup. Switch to state variable syntax in the affected predicates. Make the error message for an internal error in loopcheck predicates more precise. Mark the code fragments that modify tabling data structures as impure and code fragments that examine tabling data structures as semipure. runtime/mercury_stacks.[ch]: Implement the new stack of possibly negated contexts that we use to detect false failures due to suspensions in negated contexts. Fix a bug: don't refer to MR_cut_stack[-1]. Shorten the name of the generator stack. runtime/mercury_context.[ch]: runtime/mercury_memory.c: runtime/mercury_wrapper.[ch]: Allocate memory for the new stack of possibly negated contexts. Use the shortened name of the generator stack. runtime/mercury_regorder.h: Allocate a pointer for the new stack of possibly negated contexts. runtime/mercury_minimal_model.[ch]: A new module holding the part of mercury_tabling.[ch] that is specific to minimal model tabling. This version contains tools to help debugging of minimal model tabling, as well as some bug fixes found with the aid of those tools. runtime/mercury_tabling.[ch]: Remove the code moved to mercury_minimal_model.[ch], and add the code moved here from trace/mercury_trace_internal.c. Add prefixes to a bunch of structure fields to make it easier to read code accessing those fields. Add mechanisms to allocate and copy tabling structures with type safety. runtime/mercury_imp.h: #include the new header file, if it is needed. runtime/Mmakefile: Mention the new module, and fix sortedness errors. runtime/mercury_stack_trace.c: Fix a bug that sometimes caused stack traces to abort in minimal model grades: they were trying to get layout information from labels that do not have them, such as do_fail. If MR_TABLE_DEBUG is defined, print the locations of stack frames when doing stack dumps. runtime/mercury_trace_base.h: Export to mercury_stack_trace.c the labels that we use to let the debugger get control at redos and fails, since they don't have layout information. runtime/mercury_types.h: Move typedefs here from mercury_tabling.h, and add typedefs for some newly added types. runtime/mercury_engine.[ch]: Add a table mapping debugging flags to their offsets in the MR_debugflag array, for use in the debugger. runtime/mercury_misc.c: Make the formatting of det stack pointers the same as nondet stack pointers in debugging output. runtime/mercury_debug.[ch]: Add conditionally compiled debugging output when creating temp frames on the nondet stack. library/table_builtin.m: Conform to the new names of some fields. Add a predicate to return the status of a subgoal. Add conditionally compiled debugging code. library/Mmakefile: Make table_builtin.m depend on runtime/mercury_minimal_model.h. trace/mercury_trace.c: Conform to the new names of some fields. trace/mercury_trace_internal.c: Add two new mdb commands, to print the cut stack and the new possibly negated context stack. Add two new mdb commands to print a subgoal and a consumer. Move some of the code to print tabling-related data structures to runtime/mercury_tabling.[ch]. Add a new mdb command to report the values of debugging flags and to set and clear them. Previously, one had to turn on these debugging flags with environment variables, which were problematic because they turned on diagnostic printouts even in Mercury programs that *weren't* being debugged, such as the Mercury compiler when being used to generate the program to be debugged. Now the flags can be turned on from a .mdbrc file, which eliminates much setting and unsetting of environment variables. doc/user_guide.tex: Document the new mdb commands. tests/debugger/mdb_command_test.inp: Test the documentation of the new mdb commands. tests/debugger/completion.exp: Expect the new commands in the command completion test. tests/debugger//nondet_stack.exp*: Expect the new format of det stack pointers. tests/debugger/all_solutions.exp3: tests/debugger/exception_value.exp3: tests/debugger/declarative/catch.exp3: tests/debugger/declarative/ho5.exp3: tests/debugger/declarative/throw.exp3: New expected test cases for use in minimal model grades. They differ from existing expected output files only in the precise phrasing of error messages. tests/debugger/declarative/Mmakefile: Disable the untraced_subgoal test case in .mm grades, since we don't pass it yet. tests/tabling/Mmakefile: Enable the mday test case, now that we pass it.	2003-03-18 16:39:01 +00:00