Skip to content

Commit 14197f6

Browse files
committed
Merge pull request #2015 from practicalswift/gardening-20160401
[gardening] Friday gardening: typos, file headers & PEP-8
2 parents 99b89d3 + 292bbe9 commit 14197f6

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

lib/SILOptimizer/Transforms/CSE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ bool CSE::canHandle(SILInstruction *Inst) {
617617
return false;
618618
}
619619
if (auto *BI = dyn_cast<BuiltinInst>(Inst)) {
620-
// Althouth the onFastPath builtin has no side-effects we don't want to
620+
// Although the onFastPath builtin has no side-effects we don't want to
621621
// (re-)move it.
622622
if (BI->getBuiltinInfo().ID == BuiltinValueKind::OnFastPath)
623623
return false;

lib/SILOptimizer/Transforms/DeadCodeElimination.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static bool seemsUseful(SILInstruction *I) {
4444
return true;
4545

4646
if (auto *BI = dyn_cast<BuiltinInst>(I)) {
47-
// Althouth the onFastPath builtin has no side-effects we don't want to
47+
// Although the onFastPath builtin has no side-effects we don't want to
4848
// remove it.
4949
if (BI->getBuiltinInfo().ID == BuiltinValueKind::OnFastPath)
5050
return true;

lib/SILOptimizer/Utils/LoadStoreOptUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- LSBase.cpp -------------------------------------------------------===//
1+
//===--- LoadStoreOptUtils.cpp --------------------------------------------===//
22
//
33
// This source file is part of the Swift.org open source project
44
//

lib/SILOptimizer/Utils/Local.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ swift::isInstructionTriviallyDead(SILInstruction *I) {
4646
return false;
4747

4848
if (auto *BI = dyn_cast<BuiltinInst>(I)) {
49-
// Althouth the onFastPath builtin has no side-effects we don't want to
49+
// Although the onFastPath builtin has no side-effects we don't want to
5050
// remove it.
5151
if (BI->getBuiltinInfo().ID == BuiltinValueKind::OnFastPath)
5252
return false;

unittests/runtime/Refcounting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ TEST(RefcountingTest, unowned_retain_release_n) {
153153
EXPECT_EQ(1u, value);
154154
}
155155

156-
//////////////////////////////////////////
157-
// Non-atomic referenece counting tests //
158-
//////////////////////////////////////////
156+
/////////////////////////////////////////
157+
// Non-atomic reference counting tests //
158+
/////////////////////////////////////////
159159

160160
TEST(RefcountingTest, nonatomic_release) {
161161
size_t value = 0;

utils/build-script

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,8 @@ build the Debug variant of the Swift standard library and SDK overlay""",
549549
action="store_true")
550550
parser.add_argument(
551551
"--build-runtime-with-host-compiler",
552-
help="Use the host compiler, not the self-built one to compile the swift runtime",
552+
help="Use the host compiler, not the self-built one to compile the " +
553+
"Swift runtime",
553554
action="store_true")
554555

555556
parser.add_argument(

0 commit comments

Comments
 (0)