Skip to content

Commit 3a75394

Browse files
authored
Merge pull request #3016 from practicalswift/objective-c
[gardening] Use consistent capitalization for "Objective-C".
2 parents e15861a + 4485f76 commit 3a75394

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

benchmark/scripts/Benchmark_RuntimeLeaksRunner.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import perf_test_driver # noqa (E402 module level import not at top of file)
2626
XFAIL_LIST = [
2727
]
2828

29-
# Global objective-c classes created by various frameworks. We do not care
29+
# Global Objective-C classes created by various frameworks. We do not care
3030
# about these.
3131
IGNORABLE_GLOBAL_OBJC_CLASSES = set([
3232
'__NSPlaceholderDate',

docs/SIL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ entity discriminators:
865865
- ``ivarinitializer``: a class's ivar initializer
866866
- ``defaultarg.``\ *n*: the default argument-generating function for
867867
the *n*\ -th argument of a Swift ``func``
868-
- ``foreign``: a specific entry point for C/objective-C interoperability
868+
- ``foreign``: a specific entry point for C/Objective-C interoperability
869869

870870
Methods and curried function definitions in Swift also have multiple
871871
"uncurry levels" in SIL, representing the function at each possible

lib/IRGen/GenMeta.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,7 +3245,7 @@ namespace {
32453245
addWord(flags);
32463246
} else {
32473247
// On non-objc platforms just fill it with a null, there
3248-
// is no objective-c metaclass.
3248+
// is no Objective-C metaclass.
32493249
// FIXME: Remove this to save metadata space.
32503250
// rdar://problem/18801263
32513251
addWord(llvm::ConstantExpr::getNullValue(IGM.IntPtrTy));
@@ -3375,7 +3375,7 @@ namespace {
33753375

33763376
void addClassDataPointer() {
33773377
if (!IGM.ObjCInterop) {
3378-
// with no objective-c runtime, just give an empty pointer with the
3378+
// with no Objective-C runtime, just give an empty pointer with the
33793379
// swift bit set.
33803380
addWord(llvm::ConstantInt::get(IGM.IntPtrTy, 1));
33813381
return;

lib/SILOptimizer/Transforms/DeadObjectElimination.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static SILFunction *getDestructor(AllocRefInst *ARI) {
8383
// If the destructor has an objc_method calling convention, we cannot
8484
// analyze it since it could be swapped out from under us at runtime.
8585
if (Fn->getRepresentation() == SILFunctionTypeRepresentation::ObjCMethod) {
86-
DEBUG(llvm::dbgs() << " Found objective-c destructor. Can't "
86+
DEBUG(llvm::dbgs() << " Found Objective-C destructor. Can't "
8787
"analyze!\n");
8888
return nullptr;
8989
}

stdlib/public/runtime/Casting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ static void _failCorruptType(const Metadata *type) {
409409
}
410410

411411
#if SWIFT_OBJC_INTEROP
412-
// Objective-c bridging helpers.
412+
// Objective-C bridging helpers.
413413
namespace {
414414
struct _ObjectiveCBridgeableWitnessTable;
415415
}

0 commit comments

Comments
 (0)