commit f35520f064c8226924233c02516fea94bd5e5aac
author Mads Ager <ager@google.com> Wed May 23 09:32:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 23 09:32:37 2018 +0000
tree 5ad177b62dd33e9055652412673f53f49c676bd8
parent a4042f56b8c9864e3d3645d429a02047051bba1f
parent e1fe5e531b59714a62032938094fee82f7bb4a4c

Merge "Only rewrite invoke-virtual to invoke-direct if the direct resolution result is on the target of the invoke and *not* a base class."

tools/run-d8-on-gmscore.py

diff --git a/tools/run-d8-on-gmscore.py b/tools/run-d8-on-gmscore.py
index b1bdc6e..4a64693 100755
--- a/tools/run-d8-on-gmscore.py
+++ b/tools/run-d8-on-gmscore.py
@@ -76,7 +76,7 @@
         build=not options.no_build,
         debug=not options.no_debug,
         profile=options.profile,
-        track_memory_to_file=options.track_memory_to_file)
+        track_memory_file=options.track_memory_to_file)
 
 if __name__ == '__main__':
   sys.exit(main())

tools/run_on_app.py

diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 571d96d..41340c7 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -203,7 +203,7 @@
       toolhelper.run(options.compiler, args, build=not options.no_build,
                      debug=not options.no_debug,
                      profile=options.profile,
-                     track_memory_to_file=options.track_memory_to_file)
+                     track_memory_file=options.track_memory_to_file)
       if options.print_memoryuse:
         print('{}(MemoryUse): {}'
             .format(options.print_memoryuse,