[clang][NFC] Fix some more incorrectly formatted comments #138342
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sarnie, Nick <[email protected]>
You can test this locally with the following command:git-clang-format --diff HEAD~1 HEAD --extensions cpp -- clang/lib/AST/Type.cpp clang/lib/CodeGen/CGCall.cppView the diff from clang-format here.diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 2f1c7699d..82a24f7c2 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -672,10 +672,10 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM,
addExtParameterInfosForCall(paramInfos, proto, numExtraRequiredArgs,
args.size());
- // If we don't have a prototype at all, but we're supposed to
- // explicitly use the variadic convention for unprototyped calls,
- // treat all of the arguments as required but preserve the nominal
- // possibility of variadics.
+ // If we don't have a prototype at all, but we're supposed to
+ // explicitly use the variadic convention for unprototyped calls,
+ // treat all of the arguments as required but preserve the nominal
+ // possibility of variadics.
} else if (CGM.getTargetCodeGenInfo().isNoProtoCallVariadic(
args, cast<FunctionNoProtoType>(fnType))) {
required = RequiredArgs(args.size());
@@ -4061,7 +4061,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
if (results.size() == 1) {
RV = results[0];
- // Otherwise, we need to make a first-class aggregate.
+ // Otherwise, we need to make a first-class aggregate.
} else {
// Construct a return type that lacks padding elements.
llvm::Type *returnType = RetAI.getUnpaddedCoerceAndExpandType();
@@ -4200,11 +4200,11 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
if (type->isReferenceType()) {
args.add(RValue::get(Builder.CreateLoad(local)), type);
- // In ARC, move out of consumed arguments so that the release cleanup
- // entered by StartFunction doesn't cause an over-release. This isn't
- // optimal -O0 code generation, but it should get cleaned up when
- // optimization is enabled. This also assumes that delegate calls are
- // performed exactly once for a set of arguments, but that should be safe.
+ // In ARC, move out of consumed arguments so that the release cleanup
+ // entered by StartFunction doesn't cause an over-release. This isn't
+ // optimal -O0 code generation, but it should get cleaned up when
+ // optimization is enabled. This also assumes that delegate calls are
+ // performed exactly once for a set of arguments, but that should be safe.
} else if (getLangOpts().ObjCAutoRefCount &&
param->hasAttr<NSConsumedAttr>() && type->isObjCRetainableType()) {
llvm::Value *ptr = Builder.CreateLoad(local);
@@ -4213,8 +4213,8 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
Builder.CreateStore(null, local);
args.add(RValue::get(ptr), type);
- // For the most part, we just need to load the alloca, except that
- // aggregate r-values are actually pointers to temporaries.
+ // For the most part, we just need to load the alloca, except that
+ // aggregate r-values are actually pointers to temporaries.
} else {
args.add(convertTempToRValue(local, type, loc), type);
}
@@ -4306,7 +4306,7 @@ static void emitWriteback(CodeGenFunction &CGF,
// Release the old value.
CGF.EmitARCRelease(oldValue, srcLV.isARCPreciseLifetime());
- // Otherwise, we can just do a normal lvalue store.
+ // Otherwise, we can just do a normal lvalue store.
} else {
CGF.EmitStoreThroughLValue(RValue::get(value), srcLV);
}
@@ -4347,7 +4347,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
if (const Expr *lvExpr = maybeGetUnaryAddrOfOperand(CRE->getSubExpr())) {
srcLV = CGF.EmitLValue(lvExpr);
- // Otherwise, just emit it as a scalar.
+ // Otherwise, just emit it as a scalar.
} else {
Address srcAddr = CGF.EmitPointerWithAlignment(CRE->getSubExpr());
|
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-codegen Author: Nick Sarnie (sarnex) ChangesMore fixes based on #138036 Full diff: https://github.com/llvm/llvm-project/pull/138342.diff 2 Files Affected:
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 59369fba2e772..3af3e56eb66f6 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -4911,8 +4911,8 @@ std::optional<NullabilityKind> Type::getNullability() const {
bool Type::canHaveNullability(bool ResultIfUnknown) const {
QualType type = getCanonicalTypeInternal();
+ // We'll only see canonical types here.
switch (type->getTypeClass()) {
- // We'll only see canonical types here.
#define NON_CANONICAL_TYPE(Class, Parent) \
case Type::Class: \
llvm_unreachable("non-canonical type");
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index b5a7217dd3e56..621a26b16b040 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -672,10 +672,10 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM,
addExtParameterInfosForCall(paramInfos, proto, numExtraRequiredArgs,
args.size());
- // If we don't have a prototype at all, but we're supposed to
- // explicitly use the variadic convention for unprototyped calls,
- // treat all of the arguments as required but preserve the nominal
- // possibility of variadics.
+ // If we don't have a prototype at all, but we're supposed to
+ // explicitly use the variadic convention for unprototyped calls,
+ // treat all of the arguments as required but preserve the nominal
+ // possibility of variadics.
} else if (CGM.getTargetCodeGenInfo().isNoProtoCallVariadic(
args, cast<FunctionNoProtoType>(fnType))) {
required = RequiredArgs(args.size());
@@ -4064,7 +4064,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
if (results.size() == 1) {
RV = results[0];
- // Otherwise, we need to make a first-class aggregate.
+ // Otherwise, we need to make a first-class aggregate.
} else {
// Construct a return type that lacks padding elements.
llvm::Type *returnType = RetAI.getUnpaddedCoerceAndExpandType();
@@ -4203,11 +4203,11 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
if (type->isReferenceType()) {
args.add(RValue::get(Builder.CreateLoad(local)), type);
- // In ARC, move out of consumed arguments so that the release cleanup
- // entered by StartFunction doesn't cause an over-release. This isn't
- // optimal -O0 code generation, but it should get cleaned up when
- // optimization is enabled. This also assumes that delegate calls are
- // performed exactly once for a set of arguments, but that should be safe.
+ // In ARC, move out of consumed arguments so that the release cleanup
+ // entered by StartFunction doesn't cause an over-release. This isn't
+ // optimal -O0 code generation, but it should get cleaned up when
+ // optimization is enabled. This also assumes that delegate calls are
+ // performed exactly once for a set of arguments, but that should be safe.
} else if (getLangOpts().ObjCAutoRefCount &&
param->hasAttr<NSConsumedAttr>() && type->isObjCRetainableType()) {
llvm::Value *ptr = Builder.CreateLoad(local);
@@ -4216,8 +4216,8 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
Builder.CreateStore(null, local);
args.add(RValue::get(ptr), type);
- // For the most part, we just need to load the alloca, except that
- // aggregate r-values are actually pointers to temporaries.
+ // For the most part, we just need to load the alloca, except that
+ // aggregate r-values are actually pointers to temporaries.
} else {
args.add(convertTempToRValue(local, type, loc), type);
}
@@ -4309,7 +4309,7 @@ static void emitWriteback(CodeGenFunction &CGF,
// Release the old value.
CGF.EmitARCRelease(oldValue, srcLV.isARCPreciseLifetime());
- // Otherwise, we can just do a normal lvalue store.
+ // Otherwise, we can just do a normal lvalue store.
} else {
CGF.EmitStoreThroughLValue(RValue::get(value), srcLV);
}
@@ -4350,7 +4350,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
if (const Expr *lvExpr = maybeGetUnaryAddrOfOperand(CRE->getSubExpr())) {
srcLV = CGF.EmitLValue(lvExpr);
- // Otherwise, just emit it as a scalar.
+ // Otherwise, just emit it as a scalar.
} else {
Address srcAddr = CGF.EmitPointerWithAlignment(CRE->getSubExpr());
|
|
@llvm/pr-subscribers-clang Author: Nick Sarnie (sarnex) ChangesMore fixes based on #138036 Full diff: https://github.com/llvm/llvm-project/pull/138342.diff 2 Files Affected:
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 59369fba2e772..3af3e56eb66f6 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -4911,8 +4911,8 @@ std::optional<NullabilityKind> Type::getNullability() const {
bool Type::canHaveNullability(bool ResultIfUnknown) const {
QualType type = getCanonicalTypeInternal();
+ // We'll only see canonical types here.
switch (type->getTypeClass()) {
- // We'll only see canonical types here.
#define NON_CANONICAL_TYPE(Class, Parent) \
case Type::Class: \
llvm_unreachable("non-canonical type");
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index b5a7217dd3e56..621a26b16b040 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -672,10 +672,10 @@ arrangeFreeFunctionLikeCall(CodeGenTypes &CGT, CodeGenModule &CGM,
addExtParameterInfosForCall(paramInfos, proto, numExtraRequiredArgs,
args.size());
- // If we don't have a prototype at all, but we're supposed to
- // explicitly use the variadic convention for unprototyped calls,
- // treat all of the arguments as required but preserve the nominal
- // possibility of variadics.
+ // If we don't have a prototype at all, but we're supposed to
+ // explicitly use the variadic convention for unprototyped calls,
+ // treat all of the arguments as required but preserve the nominal
+ // possibility of variadics.
} else if (CGM.getTargetCodeGenInfo().isNoProtoCallVariadic(
args, cast<FunctionNoProtoType>(fnType))) {
required = RequiredArgs(args.size());
@@ -4064,7 +4064,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
if (results.size() == 1) {
RV = results[0];
- // Otherwise, we need to make a first-class aggregate.
+ // Otherwise, we need to make a first-class aggregate.
} else {
// Construct a return type that lacks padding elements.
llvm::Type *returnType = RetAI.getUnpaddedCoerceAndExpandType();
@@ -4203,11 +4203,11 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
if (type->isReferenceType()) {
args.add(RValue::get(Builder.CreateLoad(local)), type);
- // In ARC, move out of consumed arguments so that the release cleanup
- // entered by StartFunction doesn't cause an over-release. This isn't
- // optimal -O0 code generation, but it should get cleaned up when
- // optimization is enabled. This also assumes that delegate calls are
- // performed exactly once for a set of arguments, but that should be safe.
+ // In ARC, move out of consumed arguments so that the release cleanup
+ // entered by StartFunction doesn't cause an over-release. This isn't
+ // optimal -O0 code generation, but it should get cleaned up when
+ // optimization is enabled. This also assumes that delegate calls are
+ // performed exactly once for a set of arguments, but that should be safe.
} else if (getLangOpts().ObjCAutoRefCount &&
param->hasAttr<NSConsumedAttr>() && type->isObjCRetainableType()) {
llvm::Value *ptr = Builder.CreateLoad(local);
@@ -4216,8 +4216,8 @@ void CodeGenFunction::EmitDelegateCallArg(CallArgList &args,
Builder.CreateStore(null, local);
args.add(RValue::get(ptr), type);
- // For the most part, we just need to load the alloca, except that
- // aggregate r-values are actually pointers to temporaries.
+ // For the most part, we just need to load the alloca, except that
+ // aggregate r-values are actually pointers to temporaries.
} else {
args.add(convertTempToRValue(local, type, loc), type);
}
@@ -4309,7 +4309,7 @@ static void emitWriteback(CodeGenFunction &CGF,
// Release the old value.
CGF.EmitARCRelease(oldValue, srcLV.isARCPreciseLifetime());
- // Otherwise, we can just do a normal lvalue store.
+ // Otherwise, we can just do a normal lvalue store.
} else {
CGF.EmitStoreThroughLValue(RValue::get(value), srcLV);
}
@@ -4350,7 +4350,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
if (const Expr *lvExpr = maybeGetUnaryAddrOfOperand(CRE->getSubExpr())) {
srcLV = CGF.EmitLValue(lvExpr);
- // Otherwise, just emit it as a scalar.
+ // Otherwise, just emit it as a scalar.
} else {
Address srcAddr = CGF.EmitPointerWithAlignment(CRE->getSubExpr());
|
clang/lib/AST/Type.cpp
Outdated
| @@ -4911,8 +4911,8 @@ std::optional<NullabilityKind> Type::getNullability() const { | |||
| bool Type::canHaveNullability(bool ResultIfUnknown) const { | |||
| QualType type = getCanonicalTypeInternal(); | |||
|
|
|||
| // We'll only see canonical types here. | |||
There was a problem hiding this comment.
Actually, maybe move this inside the define, like:
#define NON_CANONICAL_TYPE(Class, Parent) \
// We'll only see canonical types here. \
case Type::Class: \
llvm_unreachable("non-canonical type");
(Not that the comment is really useful, but I don't want to modify it in a format-fixing commit.)
There was a problem hiding this comment.
done in latest commit, thanks!
Signed-off-by: Sarnie, Nick <[email protected]>
efriedma-quic
approved these changes
May 6, 2025
|
Causes some build error/warning, gonna revert this and fix the problem |
|
Wow you're fast, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More fixes based on #138036