Update prebuilt Clang to r416183b from Android.
https://android.googlesource.com/platform/prebuilts/clang/host/
linux-x86/+/06a71ddac05c22edb2d10b590e1769b3f8619bef
clang 12.0.5 (based on r416183b) from build 7284624.
Change-Id: I277a316abcf47307562d8b748b84870f31a72866
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/linux-x64/clang/share/opt-viewer/opt-viewer.py b/linux-x64/clang/share/opt-viewer/opt-viewer.py
index 4c10588..714fccc 100755
--- a/linux-x64/clang/share/opt-viewer/opt-viewer.py
+++ b/linux-x64/clang/share/opt-viewer/opt-viewer.py
@@ -3,10 +3,10 @@
from __future__ import print_function
import argparse
-import cgi
-import codecs
import errno
import functools
+import html
+import io
from multiprocessing import cpu_count
import os.path
import re
@@ -54,12 +54,12 @@
existing_filename = fn
self.no_highlight = no_highlight
- self.stream = codecs.open(os.path.join(output_dir, optrecord.html_file_name(filename)), 'w', encoding='utf-8')
+ self.stream = io.open(os.path.join(output_dir, optrecord.html_file_name(filename)), 'w', encoding='utf-8')
if existing_filename:
- self.source_stream = open(existing_filename)
+ self.source_stream = io.open(existing_filename, encoding='utf-8')
else:
self.source_stream = None
- print('''
+ print(u'''
<html>
<h1>Unable to locate file {}</h1>
</html>
@@ -72,10 +72,7 @@
file_text = stream.read()
if self.no_highlight:
- if sys.version_info.major >= 3:
- html_highlighted = file_text
- else:
- html_highlighted = file_text.decode('utf-8')
+ html_highlighted = file_text
else:
html_highlighted = highlight(
file_text,
@@ -147,7 +144,7 @@
if not self.source_stream:
return
- print('''
+ print(u'''
<html>
<title>{}</title>
<meta charset="utf-8" />
@@ -186,7 +183,7 @@
<tbody>'''.format(os.path.basename(self.filename)), file=self.stream)
self.render_source_lines(self.source_stream, line_remarks)
- print('''
+ print(u'''
</tbody>
</table>
</body>
@@ -195,12 +192,12 @@
class IndexRenderer:
def __init__(self, output_dir, should_display_hotness, max_hottest_remarks_on_index):
- self.stream = codecs.open(os.path.join(output_dir, 'index.html'), 'w', encoding='utf-8')
+ self.stream = io.open(os.path.join(output_dir, 'index.html'), 'w', encoding='utf-8')
self.should_display_hotness = should_display_hotness
self.max_hottest_remarks_on_index = max_hottest_remarks_on_index
def render_entry(self, r, odd):
- escaped_name = cgi.escape(r.DemangledFunctionName)
+ escaped_name = html.escape(r.DemangledFunctionName)
print(u'''
<tr>
<td class=\"column-entry-{odd}\"><a href={r.Link}>{r.DebugLocString}</a></td>
@@ -210,7 +207,7 @@
</tr>'''.format(**locals()), file=self.stream)
def render(self, all_remarks):
- print('''
+ print(u'''
<html>
<meta charset="utf-8" />
<head>
@@ -233,7 +230,7 @@
for i, remark in enumerate(all_remarks[:max_entries]):
if not suppress(remark):
self.render_entry(remark, i % 2)
- print('''
+ print(u'''
</table>
</body>
</html>''', file=self.stream)