#include <xbt/sysdep.h>
#include "src/internal_config.h"
-#include "mc_object_info.h"
-#include "mc_safety.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_smx.h"
-#include "mc_dwarf.hpp"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_dwarf.hpp"
#include "src/mc/Frame.hpp"
#include "src/mc/ObjectInformation.hpp"
current_var1 = &stack1->local_variables[cursor];
current_var2 = &stack1->local_variables[cursor];
if (current_var1->name != current_var2->name
- || current_var1->subprogram != current_var1->subprogram
+ || current_var1->subprogram != current_var2->subprogram
|| current_var1->ip != current_var2->ip) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
XBT_VERB
mc_snapshot_stack_t stack1, stack2;
while (cursor < s1->stacks.size()) {
stack1 = &s1->stacks[cursor];
- stack2 = &s1->stacks[cursor];
+ stack2 = &s2->stacks[cursor];
if (stack1->process_index != stack2->process_index) {
diff_local = 1;