Index: utils/opt-viewer/opt-viewer.py =================================================================== --- utils/opt-viewer/opt-viewer.py +++ utils/opt-viewer/opt-viewer.py @@ -59,6 +59,7 @@ class Remark(yaml.YAMLObject): # Work-around for http://pyyaml.org/ticket/154. yaml_loader = Loader + ABBREV_LENGTH_LIMIT = 70 def __getattr__(self, name): # If hotness is missing, assume 0 @@ -83,6 +84,15 @@ return "{}:{}:{}".format(self.File, self.Line, self.Column) @property + def AbbreviatedFunctionName(self): + demangled = self.DemangledFunctionName + if len(demangled) > Remark.ABBREV_LENGTH_LIMIT: + return '...' + demangled[-Remark.ABBREV_LENGTH_LIMIT:] + + return demangled + + + @property def DemangledFunctionName(self): return demangle(self.Function) @@ -197,12 +207,13 @@ '''.format(**locals()), file=self.stream) def render_inline_remarks(self, r, line): - inlining_context = r.DemangledFunctionName + func_name = '