Make functions on hot path inline. Remove a mistaken virtual

declaration.

diff --git a/gold/merge.cc b/gold/merge.cc
index 01f2a9e1380e133dd144617fbdcd926d8f85309b..abe625ed873a23edb8449922aaaf23ecd3f6cfd2 100644 (file)
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -234,7 +234,7 @@ Object_merge_map::add_mapping(const Merge_map* merge_map, unsigned int shndx,
 
 // Get the output offset for an input address.
 
-bool
+inline bool
 Object_merge_map::get_output_offset(const Merge_map* merge_map,
                                    unsigned int shndx,
                                    section_offset_type input_offset,
@@ -300,7 +300,7 @@ Merge_map::add_mapping(Relobj* object, unsigned int shndx,
 // *OUTPUT_OFFSET to the offset in the output section.  This returns
 // true if the mapping is known, false otherwise.
 
-bool
+inline bool
 Merge_map::get_output_offset(const Relobj* object, unsigned int shndx,
                             section_offset_type offset,
                             section_offset_type* output_offset) const

diff --git a/gold/output.cc b/gold/output.cc
index c7fb32dae66dc0cda06616e3458d76fdac3c25ac..fa2bff02226e8d1d6b7e9e0f1aadd96a60fac03b 100644 (file)
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -1349,7 +1349,7 @@ Output_section::Input_section::finalize_data_size()
 
 // Try to turn an input offset into an output offset.
 
-bool
+inline bool
 Output_section::Input_section::output_offset(
     const Relobj* object,
     unsigned int shndx,

diff --git a/gold/output.h b/gold/output.h
index 51c85026c9b4833a836660f201434d3cc39cf7fa..38e5c486076fda93e499857ef407d1a3efd05fbe 100644 (file)
--- a/gold/output.h
+++ b/gold/output.h
@@ -460,7 +460,7 @@ class Output_section_data : public Output_data
   // the output section is known.  If this function returns true, it
   // sets *POUTPUT to the output offset.  The value -1 indicates that
   // this input offset is being discarded.
-  virtual bool
+  bool
   output_offset(const Relobj* object, unsigned int shndx,
                section_offset_type offset,
                section_offset_type *poutput) const