octave: libinterp/parse-tree/jit-ir.cc comparison

comparison libinterp/parse-tree/jit-ir.cc @ 29654:d13d090cb03a stable

use std::size_t and std::ptrdiff_t in C++ code (bug #60471) Files affected: make_int.cc, file-editor-tab.cc, octave-qscintilla.cc, Cell.cc, Cell.h, call-stack.cc, call-stack.h, cellfun.cc, data.cc, debug.cc, dlmread.cc, error.cc, event-queue.h, fcn-info.cc, fcn-info.h, file-io.cc, ft-text-renderer.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, help.cc, hex2num.cc, input.cc, latex-text-renderer.cc, load-path.cc, load-save.cc, load-save.h, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat5.cc, ls-oct-text.cc, mex.cc, mexproto.h, mxarray.h, oct-map.cc, oct-stream.cc, oct-stream.h, pager.cc, pager.h, pr-output.cc, regexp.cc, settings.h, stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, sysdep.cc, toplev.cc, utils.cc, utils.h, variables.cc, __fltk_uigetfile__.cc, __init_fltk__.cc, audioread.cc, gzip.cc, cdef-class.cc, cdef-manager.cc, cdef-method.cc, cdef-object.cc, cdef-object.h, ov-base-diag.cc, ov-base-diag.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-lazy-idx.h, ov-perm.cc, ov-perm.h, ov-range.h, ov-str-mat.cc, ov-struct.cc, ov-struct.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, octave.cc, bp-table.cc, jit-ir.cc, jit-ir.h, jit-typeinfo.cc, jit-typeinfo.h, jit-util.h, lex.h, lex.ll, oct-lvalue.cc, oct-parse.yy, parse.h, profiler.h, pt-eval.cc, pt-eval.h, pt-jit.cc, pt-jit.h, pt-pr-code.cc, pt-tm-const.cc, pt-tm-const.h, Array.h, CMatrix.cc, DiagArray2.h, PermMatrix.h, Sparse.h, dMatrix.cc, fCMatrix.cc, fMatrix.cc, bsxfun-defs.cc, oct-fftw.cc, oct-fftw.h, randpoisson.cc, sparse-chol.cc, mx-inlines.cc, file-ops.cc, lo-sysdep.cc, oct-env.cc, oct-time.cc, action-container.cc, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-hist.cc, data-conv.cc, data-conv.h, f77-fcn.h, file-info.cc, file-info.h, kpse.cc, kpse.h, lo-cutils.h, lo-hash.h, lo-regexp.cc, oct-base64.cc, oct-base64.h, oct-binmap.h, oct-glob.cc, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sparse.h, oct-string.cc, quit.cc, unwind-prot.h, url-transfer.cc, main.in.cc, mkoctfile.in.cc, and shared-fcns.h. (grafted from aef11bb4e6d1f303ad9de5688fcb7244ef48867e)

author	John W. Eaton <jwe@octave.org>
date	Wed, 28 Apr 2021 22:57:42 -0400
parents	0a5b15007766
children

comparison

equal deleted inserted replaced

-:5068a97f0f39
+:d13d090cb03a
 jit_value::replace_with (jit_value *value)
 {
 while (first_use ())
 {
 jit_instruction *user = first_use ()->user ();
-size_t idx = first_use ()->index ();
+std::size_t idx = first_use ()->index ();
 user->stash_argument (idx, value);
 }
 }
 #define JIT_METH(clname)                                \
 jit_print (os, type ()) << ": ";
 return os << '#' << m_id;
 }
 void
-jit_instruction::do_construct_ssa (size_t start, size_t end)
+jit_instruction::do_construct_ssa (std::size_t start, std::size_t end)
 {
-for (size_t i = start; i < end; ++i)
+for (std::size_t i = start; i < end; ++i)
 {
 jit_value *arg = argument (i);
 jit_variable *var = dynamic_cast<jit_variable *> (arg);
 if (var && var->has_top ())
 stash_argument (i, var->top ());
 {
 return terminator ()->alive (asucc);
 }
 jit_block *
-jit_block::successor (size_t i) const
+jit_block::successor (std::size_t i) const
 {
 jit_terminator *term = terminator ();
 return term->successor (i);
 }
-size_t
+std::size_t
 jit_block::successor_count (void) const
 {
 jit_terminator *term = terminator ();
 return term ? term->successor_count () : 0;
 }
 for (jit_use *use = first_use (); use; use = use->next ())
 os << *use->user_parent () << ' ';
 os << std::endl;
 os << "  successors: ";
-for (size_t i = 0; i < successor_count (); ++i)
+for (std::size_t i = 0; i < successor_count (); ++i)
 os << *successor (i) << ' ';
 os << std::endl;
 os << "  m_idom: ";
 if (m_idom)
 for (auto iter = df_begin (); iter != df_end (); ++iter)
 os << **iter << ' ';
 os << std::endl;
 os << "  m_dom_succ: ";
-for (size_t i = 0; i < m_dom_succ.size (); ++i)
+for (std::size_t i = 0; i < m_dom_succ.size (); ++i)
 os << *m_dom_succ[i] << ' ';
 return os << std::endl;
 }
 void
-jit_block::compute_df (size_t avisit_count)
+jit_block::compute_df (std::size_t avisit_count)
 {
 if (visited (avisit_count))
 return;
 if (use_count () >= 2)
 runner = runner->m_idom;
 }
 }
 }
-for (size_t i = 0; i < successor_count (); ++i)
+for (std::size_t i = 0; i < successor_count (); ++i)
 successor (i)->compute_df (avisit_count);
 }
 bool
-jit_block::update_idom (size_t avisit_count)
+jit_block::update_idom (std::size_t avisit_count)
 {
 if (visited (avisit_count) || ! use_count ())
 return false;
 bool changed = false;
 return changed;
 }
 void
-jit_block::label (size_t avisit_count, size_t& number)
+jit_block::label (std::size_t avisit_count, std::size_t& number)
 {
 if (visited (avisit_count))
 return;
 for (jit_use *use = first_use (); use; use = use->next ())
 instr->pop_variable ();
 }
 }
 std::ostream&
-jit_block::print (std::ostream& os, size_t indent) const
+jit_block::print (std::ostream& os, std::size_t indent) const
 {
 print_indent (os, indent);
 short_print (os) << ":        %pred = ";
 for (jit_use *use = first_use (); use; use = use->next ())
 {
 jit_block *asuccessor)
 {
 if (successor_count () > 1)
 {
 jit_terminator *term = terminator ();
-size_t idx = term->successor_index (asuccessor);
+std::size_t idx = term->successor_index (asuccessor);
 jit_block *split = factory.create<jit_block> ("phi_split", m_visit_count);
 // place after this to ensure define before use in the blocks list
 blocks.insert_after (this, split);
 return this;
 }
 void
-jit_block::create_dom_tree (size_t avisit_count)
+jit_block::create_dom_tree (std::size_t avisit_count)
 {
 if (visited (avisit_count))
 return;
 if (m_idom != this)
 m_idom->m_dom_succ.push_back (this);
-for (size_t i = 0; i < successor_count (); ++i)
+for (std::size_t i = 0; i < successor_count (); ++i)
 successor (i)->create_dom_tree (avisit_count);
 }
 jit_block *
 jit_block::idom_intersect (jit_block *i, jit_block *j)
 // -------------------- jit_phi --------------------
 bool
 jit_phi::prune (void)
 {
 jit_block *p = parent ();
-size_t new_idx = 0;
+std::size_t new_idx = 0;
 jit_value *unique = argument (1);
-for (size_t i = 0; i < argument_count (); ++i)
+for (std::size_t i = 0; i < argument_count (); ++i)
 {
 jit_block *inc = incoming (i);
 if (inc->branch_alive (p))
 {
 if (unique != argument (i))
 jit_block *p = parent ();
 if (! p->alive ())
 return false;
 jit_type *infered = nullptr;
-for (size_t i = 0; i < argument_count (); ++i)
+for (std::size_t i = 0; i < argument_count (); ++i)
 {
 jit_block *inc = incoming (i);
 if (inc->branch_alive (p))
 infered = jit_type_join (infered, argument_type (i));
 }
 {
 return llvm::cast<llvm::PHINode> (jit_value::to_llvm ());
 }
 // -------------------- jit_terminator --------------------
-size_t
+std::size_t
 jit_terminator::successor_index (const jit_block *asuccessor) const
 {
-size_t scount = successor_count ();
+std::size_t scount = successor_count ();
-for (size_t i = 0; i < scount; ++i)
+for (std::size_t i = 0; i < scount; ++i)
 if (successor (i) == asuccessor)
 return i;
 panic_impossible ();
 }
 {
 if (! parent ()->alive ())
 return false;
 bool changed = false;
-for (size_t i = 0; i < m_alive.size (); ++i)
+for (std::size_t i = 0; i < m_alive.size (); ++i)
 if (! m_alive[i] && check_alive (i))
 {
 changed = true;
 m_alive[i] = true;
 successor (i)->mark_alive ();
 bool
 jit_call::infer (void)
 {
 // FIXME: explain algorithm
-for (size_t i = 0; i < argument_count (); ++i)
+for (std::size_t i = 0; i < argument_count (); ++i)
 {
 m_already_infered[i] = argument_type (i);
 if (! m_already_infered[i])
 return false;
 }
 panic_impossible ();
 }
 }
 std::ostream&
-jit_error_check::print (std::ostream& os, size_t indent) const
+jit_error_check::print (std::ostream& os, std::size_t indent) const
 {
 print_indent (os, indent) << "error_check " << variable_to_string (m_variable)
 << ", ";
 if (has_check_for ())
 return print_successor (os << "<error> ", 0);
 }
 // -------------------- jit_magic_end --------------------
 jit_magic_end::context::context (jit_factory& factory, jit_value *avalue,
-size_t aindex, size_t acount)
+std::size_t aindex, std::size_t acount)
 : m_value (avalue), m_index (factory.create<jit_const_index> (aindex)),
 m_count (factory.create<jit_const_index> (acount))
 { }
 jit_magic_end::jit_magic_end (const std::vector<context>& full_context)
 : m_contexts (full_context)
 {
 resize_arguments (m_contexts.size ());
-size_t i;
+std::size_t i;
 std::vector<context>::const_iterator iter;
 for (iter = m_contexts.begin (), i = 0; iter != m_contexts.end (); ++iter, ++i)
 stash_argument (i, iter->m_value);
 }
 jit_magic_end::context
 jit_magic_end::resolve_context (void) const
 {
-size_t idx;
+std::size_t idx;
 for (idx = 0; idx < m_contexts.size (); ++idx)
 {
 jit_type *ctx_type = m_contexts[idx].m_value->type ();
 if (! ctx_type || ctx_type->skip_paren ())
 break;
 return false;
 }
 std::ostream&
-jit_magic_end::print (std::ostream& os, size_t indent) const
+jit_magic_end::print (std::ostream& os, std::size_t indent) const
 {
 context ctx = resolve_context ();
 short_print (print_indent (os, indent)) << " (" << *ctx.m_value << ", ";
 return os << *ctx.m_index << ", " << *ctx.m_count << ')';
 }

Mercurial > octave

comparison libinterp/parse-tree/jit-ir.cc @ 29654:d13d090cb03a stable