History

Address code analysis violations. Disable all Microsoft language extensions - All header files now end with a single new line character. Split vs_asm header from type signature templates - vs_asm_sigkind.h created

arr committed 9 years ago

Commit 02a7d6a1 parent ea995f224 files · +417 −392Browse files

Showing the changes to src/vm/execution_table.cpp (1 of 24 files). Show all

Unified · Split

src/vm/execution_table.cpp+2−2
@@ -1678,7 +1678,7 @@ namespace · 1677 unmodified lines
16781678
16791679 assert(r.module_ref != nullptr);
16801680 std::tie(handler, target_frame, handler_pc) = find_exception_handler(r.stack, *r.module_ref, faulting_pc, *exception_id);
1681− if (handler == nullptr && target_frame == nullptr && handler_pc == runtime_constants::invalid_program_counter)
1681+ if (handler == nullptr)
16821682 {
16831683 if (tool_dispatch != nullptr)
16841684 tool_dispatch->on_exception_unhandled(r, *exception_id, *e);
@@ -1687,7 +1687,7 @@ namespace · 2 unmodified lines
16871687 throw unhandled_user_exception{ exception_id->str(), faulting_module_name, faulting_pc };
16881688 }
16891689
1690− assert(target_frame != nullptr);
1690+ assert(target_frame != nullptr && handler_pc != runtime_constants::invalid_program_counter);
16911691
16921692 // Now that we know the exception has a handler, take a reference.
16931693 e->add_ref();