Skip to content

Commit e65f975

Browse files
committed
Merge pull request #540 from practicalswift/bugfixes-python-1
Fix four bugs in various Python scripts
2 parents f925f71 + d4cbcff commit e65f975

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

utils/cmpcodesize

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def main():
350350
if not oldBuildDir:
351351
sys.exit("$SWIFT_OLD_BUILDDIR not specified")
352352
if not newBuildDir:
353-
die("$SWIFT_NEW_BUILDDIR not specified")
353+
sys.exit("$SWIFT_NEW_BUILDDIR not specified")
354354
oldFileArgs = [ "O", "Ounchecked", "Onone", "dylib" ]
355355
oldFiles = []
356356
newFiles = []

utils/pass-pipeline/src/passes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
DeadFunctionElimination = Pass('DeadFunctionElimination')
1919
DeadObjectElimination = Pass('DeadObjectElimination')
2020
DefiniteInitialization = Pass('DefiniteInitialization')
21-
Devirtualizer = Pass('SpeculativeDevirtualizer')
21+
SpeculativeDevirtualizer = Pass('SpeculativeDevirtualizer')
2222
DiagnoseUnreachable = Pass('DiagnoseUnreachable')
2323
DiagnosticConstantPropagation = Pass('DiagnosticConstantPropagation')
2424
EarlyInliner = Pass('EarlyInliner')

utils/submit-benchmark-results

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Utility script for submitting benchmark results to an LNT server.
55
"""
66

77
import datetime
8+
import errno
89
import json
910
import optparse
1011
import subprocess
@@ -31,7 +32,7 @@ def capture_with_result(args, include_stderr=False):
3132
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=stderr)
3233
except OSError,e:
3334
if e.errno == errno.ENOENT:
34-
fatal('no such file or directory: %r when running %s.' % (
35+
sys.exit('no such file or directory: %r when running %s.' % (
3536
args[0], ' '.join(args)))
3637
raise
3738
out,_ = p.communicate()

0 commit comments

Comments
 (0)