[PATCH] D68138: [utils] Fix incompatibility of bisect[-skip-count] with Python 3

Mikhail Maltsev via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 1 07:52:51 PDT 2019


miyuki updated this revision to Diff 222617.
miyuki added a comment.

Added `from __future__ import print_function`


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68138/new/

https://reviews.llvm.org/D68138

Files:
  llvm/utils/bisect
  llvm/utils/bisect-skip-count


Index: llvm/utils/bisect-skip-count
===================================================================
--- llvm/utils/bisect-skip-count
+++ llvm/utils/bisect-skip-count
@@ -20,6 +20,7 @@
 # result.  Incrementing the last good count by one or decrementing the
 # last good skip by one should produce a failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -52,10 +53,10 @@
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Skip: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'skip':count, 'count':-1} for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0:
@@ -75,10 +76,10 @@
 print("Start: %d" % start)
 print("End: %d" % end)
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count, 'skip':firstcount } for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0:
Index: llvm/utils/bisect
===================================================================
--- llvm/utils/bisect
+++ llvm/utils/bisect
@@ -12,6 +12,7 @@
 # And bisect will continually call ./script.sh with various counts using
 # the exit status to determine success and failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -34,10 +35,10 @@
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count} for x in args.command]
-    print cmd
+    print(cmd)
     result = subprocess.call(cmd)
     if result == 0:
         print("    PASSES! Setting start to count")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D68138.222617.patch
Type: text/x-patch
Size: 2118 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191001/0209ead7/attachment.bin>


More information about the llvm-commits mailing list